diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java index 1b876fb..61c8686 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java @@ -15,7 +15,6 @@ import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.model.resource.BizResourceFileApproval; import com.casic.missiles.model.resource.BizResourceFileApprovalFile; -import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceFileApprovalFileService; import com.casic.missiles.service.resource.IBizResourceFileApprovalService; @@ -26,6 +25,8 @@ import java.util.List; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_APPROVAL_BEAN_NAME; + /** *

* 资源管理-文件管理-文件审批(审批通过后的文件与体系/技术文件无关) 服务实现类 @@ -34,7 +35,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_APPROVAL_BEAN_NAME) public class BizResourceFileApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileApprovalService { @Autowired private SystemTemplateMapper templateMapper; @@ -121,4 +122,9 @@ // bizResourceFileApproval.setFileTemplateFile(systemTemplate.getMinioFileName()); return ReturnUtil.success(bizResourceFileApproval); } + + @Override + public void setBizName(BizResourceFileApproval obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java index 1b876fb..61c8686 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java @@ -15,7 +15,6 @@ import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.model.resource.BizResourceFileApproval; import com.casic.missiles.model.resource.BizResourceFileApprovalFile; -import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceFileApprovalFileService; import com.casic.missiles.service.resource.IBizResourceFileApprovalService; @@ -26,6 +25,8 @@ import java.util.List; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_APPROVAL_BEAN_NAME; + /** *

* 资源管理-文件管理-文件审批(审批通过后的文件与体系/技术文件无关) 服务实现类 @@ -34,7 +35,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_APPROVAL_BEAN_NAME) public class BizResourceFileApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileApprovalService { @Autowired private SystemTemplateMapper templateMapper; @@ -121,4 +122,9 @@ // bizResourceFileApproval.setFileTemplateFile(systemTemplate.getMinioFileName()); return ReturnUtil.success(bizResourceFileApproval); } + + @Override + public void setBizName(BizResourceFileApproval obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index b8cedd8..9ffe522 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -36,6 +36,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_CHANGE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME; /** *

@@ -45,7 +46,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_CHANGE_FORM_BEAN_NAME) public class BizResourceFileChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileChangeService { @Autowired private IBizResourceFileChangeFileService changeFileService; @@ -160,6 +161,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileChange obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("change_id", changeId); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java index 1b876fb..61c8686 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java @@ -15,7 +15,6 @@ import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.model.resource.BizResourceFileApproval; import com.casic.missiles.model.resource.BizResourceFileApprovalFile; -import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceFileApprovalFileService; import com.casic.missiles.service.resource.IBizResourceFileApprovalService; @@ -26,6 +25,8 @@ import java.util.List; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_APPROVAL_BEAN_NAME; + /** *

* 资源管理-文件管理-文件审批(审批通过后的文件与体系/技术文件无关) 服务实现类 @@ -34,7 +35,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_APPROVAL_BEAN_NAME) public class BizResourceFileApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileApprovalService { @Autowired private SystemTemplateMapper templateMapper; @@ -121,4 +122,9 @@ // bizResourceFileApproval.setFileTemplateFile(systemTemplate.getMinioFileName()); return ReturnUtil.success(bizResourceFileApproval); } + + @Override + public void setBizName(BizResourceFileApproval obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index b8cedd8..9ffe522 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -36,6 +36,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_CHANGE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME; /** *

@@ -45,7 +46,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_CHANGE_FORM_BEAN_NAME) public class BizResourceFileChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileChangeService { @Autowired private IBizResourceFileChangeFileService changeFileService; @@ -160,6 +161,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileChange obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("change_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java index 800fe26..d408e06 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -17,17 +16,12 @@ import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.workbench.MessageSourceModuleEnum; -import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileGrantNoticeMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; import com.casic.missiles.model.resource.BizResourceFileGrantNoticeFile; import com.casic.missiles.model.resource.BizResourceStaffInfo; -import com.casic.missiles.model.resource.BizResourceStaffVerifier; -import com.casic.missiles.model.workbench.WorkbenchRemindMessage; -import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileGrantNoticeFileService; @@ -45,6 +39,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME; /** *

@@ -54,7 +49,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_GRANT_NOTICE_BEAN_NAME) public class BizResourceFileGrantNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileGrantNoticeService { @Autowired private IBizResourceFileGrantNoticeFileService grantNoticeFileService; @@ -207,4 +202,9 @@ return ReturnUtil.success(resourceStaffInfoList); } + @Override + public void setBizName(BizResourceFileGrantNotice obj) { + obj.setBizName(obj.getFormName()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java index 1b876fb..61c8686 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java @@ -15,7 +15,6 @@ import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.model.resource.BizResourceFileApproval; import com.casic.missiles.model.resource.BizResourceFileApprovalFile; -import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceFileApprovalFileService; import com.casic.missiles.service.resource.IBizResourceFileApprovalService; @@ -26,6 +25,8 @@ import java.util.List; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_APPROVAL_BEAN_NAME; + /** *

* 资源管理-文件管理-文件审批(审批通过后的文件与体系/技术文件无关) 服务实现类 @@ -34,7 +35,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_APPROVAL_BEAN_NAME) public class BizResourceFileApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileApprovalService { @Autowired private SystemTemplateMapper templateMapper; @@ -121,4 +122,9 @@ // bizResourceFileApproval.setFileTemplateFile(systemTemplate.getMinioFileName()); return ReturnUtil.success(bizResourceFileApproval); } + + @Override + public void setBizName(BizResourceFileApproval obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index b8cedd8..9ffe522 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -36,6 +36,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_CHANGE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME; /** *

@@ -45,7 +46,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_CHANGE_FORM_BEAN_NAME) public class BizResourceFileChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileChangeService { @Autowired private IBizResourceFileChangeFileService changeFileService; @@ -160,6 +161,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileChange obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("change_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java index 800fe26..d408e06 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -17,17 +16,12 @@ import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.workbench.MessageSourceModuleEnum; -import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileGrantNoticeMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; import com.casic.missiles.model.resource.BizResourceFileGrantNoticeFile; import com.casic.missiles.model.resource.BizResourceStaffInfo; -import com.casic.missiles.model.resource.BizResourceStaffVerifier; -import com.casic.missiles.model.workbench.WorkbenchRemindMessage; -import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileGrantNoticeFileService; @@ -45,6 +39,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME; /** *

@@ -54,7 +49,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_GRANT_NOTICE_BEAN_NAME) public class BizResourceFileGrantNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileGrantNoticeService { @Autowired private IBizResourceFileGrantNoticeFileService grantNoticeFileService; @@ -207,4 +202,9 @@ return ReturnUtil.success(resourceStaffInfoList); } + @Override + public void setBizName(BizResourceFileGrantNotice obj) { + obj.setBizName(obj.getFormName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java index be97ba7..84b4384 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileMethodConfirmMapper; @@ -30,7 +29,9 @@ import javax.servlet.http.HttpServletResponse; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_METHOD_CONFIRM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME; /** *

@@ -40,7 +41,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_CONFIRM_BEAN_NAME) public class BizResourceFileMethodConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodConfirmService { @Autowired @@ -83,4 +84,9 @@ printFileRegister.registerPrintFile(RESOURCE_FILE_METHOD_CONFIRM, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizResourceFileMethodConfirm obj) { + obj.setBizName(obj.getFormName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java index 1b876fb..61c8686 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java @@ -15,7 +15,6 @@ import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.model.resource.BizResourceFileApproval; import com.casic.missiles.model.resource.BizResourceFileApprovalFile; -import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceFileApprovalFileService; import com.casic.missiles.service.resource.IBizResourceFileApprovalService; @@ -26,6 +25,8 @@ import java.util.List; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_APPROVAL_BEAN_NAME; + /** *

* 资源管理-文件管理-文件审批(审批通过后的文件与体系/技术文件无关) 服务实现类 @@ -34,7 +35,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_APPROVAL_BEAN_NAME) public class BizResourceFileApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileApprovalService { @Autowired private SystemTemplateMapper templateMapper; @@ -121,4 +122,9 @@ // bizResourceFileApproval.setFileTemplateFile(systemTemplate.getMinioFileName()); return ReturnUtil.success(bizResourceFileApproval); } + + @Override + public void setBizName(BizResourceFileApproval obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index b8cedd8..9ffe522 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -36,6 +36,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_CHANGE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME; /** *

@@ -45,7 +46,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_CHANGE_FORM_BEAN_NAME) public class BizResourceFileChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileChangeService { @Autowired private IBizResourceFileChangeFileService changeFileService; @@ -160,6 +161,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileChange obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("change_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java index 800fe26..d408e06 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -17,17 +16,12 @@ import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.workbench.MessageSourceModuleEnum; -import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileGrantNoticeMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; import com.casic.missiles.model.resource.BizResourceFileGrantNoticeFile; import com.casic.missiles.model.resource.BizResourceStaffInfo; -import com.casic.missiles.model.resource.BizResourceStaffVerifier; -import com.casic.missiles.model.workbench.WorkbenchRemindMessage; -import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileGrantNoticeFileService; @@ -45,6 +39,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME; /** *

@@ -54,7 +49,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_GRANT_NOTICE_BEAN_NAME) public class BizResourceFileGrantNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileGrantNoticeService { @Autowired private IBizResourceFileGrantNoticeFileService grantNoticeFileService; @@ -207,4 +202,9 @@ return ReturnUtil.success(resourceStaffInfoList); } + @Override + public void setBizName(BizResourceFileGrantNotice obj) { + obj.setBizName(obj.getFormName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java index be97ba7..84b4384 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileMethodConfirmMapper; @@ -30,7 +29,9 @@ import javax.servlet.http.HttpServletResponse; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_METHOD_CONFIRM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME; /** *

@@ -40,7 +41,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_CONFIRM_BEAN_NAME) public class BizResourceFileMethodConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodConfirmService { @Autowired @@ -83,4 +84,9 @@ printFileRegister.registerPrintFile(RESOURCE_FILE_METHOD_CONFIRM, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizResourceFileMethodConfirm obj) { + obj.setBizName(obj.getFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java index 99ff716..066a925 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java @@ -25,7 +25,6 @@ import com.casic.missiles.service.resource.IBizResourceFileMethodNoveltySearchService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME; + /** *

* 资源管理-文件管理-测试校准检定方法查新记录表 服务实现类 @@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME) public class BizResourceFileMethodNoveltySearchServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodNoveltySearchService { @Autowired private IBizResourceFileMethodNoveltySearchLogService noveltySearchLogService; @@ -152,6 +153,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileMethodNoveltySearch obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noveltyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("novelty_id", noveltyId); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java index 1b876fb..61c8686 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java @@ -15,7 +15,6 @@ import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.model.resource.BizResourceFileApproval; import com.casic.missiles.model.resource.BizResourceFileApprovalFile; -import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceFileApprovalFileService; import com.casic.missiles.service.resource.IBizResourceFileApprovalService; @@ -26,6 +25,8 @@ import java.util.List; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_APPROVAL_BEAN_NAME; + /** *

* 资源管理-文件管理-文件审批(审批通过后的文件与体系/技术文件无关) 服务实现类 @@ -34,7 +35,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_APPROVAL_BEAN_NAME) public class BizResourceFileApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileApprovalService { @Autowired private SystemTemplateMapper templateMapper; @@ -121,4 +122,9 @@ // bizResourceFileApproval.setFileTemplateFile(systemTemplate.getMinioFileName()); return ReturnUtil.success(bizResourceFileApproval); } + + @Override + public void setBizName(BizResourceFileApproval obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index b8cedd8..9ffe522 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -36,6 +36,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_CHANGE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME; /** *

@@ -45,7 +46,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_CHANGE_FORM_BEAN_NAME) public class BizResourceFileChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileChangeService { @Autowired private IBizResourceFileChangeFileService changeFileService; @@ -160,6 +161,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileChange obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("change_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java index 800fe26..d408e06 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -17,17 +16,12 @@ import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.workbench.MessageSourceModuleEnum; -import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileGrantNoticeMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; import com.casic.missiles.model.resource.BizResourceFileGrantNoticeFile; import com.casic.missiles.model.resource.BizResourceStaffInfo; -import com.casic.missiles.model.resource.BizResourceStaffVerifier; -import com.casic.missiles.model.workbench.WorkbenchRemindMessage; -import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileGrantNoticeFileService; @@ -45,6 +39,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME; /** *

@@ -54,7 +49,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_GRANT_NOTICE_BEAN_NAME) public class BizResourceFileGrantNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileGrantNoticeService { @Autowired private IBizResourceFileGrantNoticeFileService grantNoticeFileService; @@ -207,4 +202,9 @@ return ReturnUtil.success(resourceStaffInfoList); } + @Override + public void setBizName(BizResourceFileGrantNotice obj) { + obj.setBizName(obj.getFormName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java index be97ba7..84b4384 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileMethodConfirmMapper; @@ -30,7 +29,9 @@ import javax.servlet.http.HttpServletResponse; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_METHOD_CONFIRM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME; /** *

@@ -40,7 +41,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_CONFIRM_BEAN_NAME) public class BizResourceFileMethodConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodConfirmService { @Autowired @@ -83,4 +84,9 @@ printFileRegister.registerPrintFile(RESOURCE_FILE_METHOD_CONFIRM, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizResourceFileMethodConfirm obj) { + obj.setBizName(obj.getFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java index 99ff716..066a925 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java @@ -25,7 +25,6 @@ import com.casic.missiles.service.resource.IBizResourceFileMethodNoveltySearchService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME; + /** *

* 资源管理-文件管理-测试校准检定方法查新记录表 服务实现类 @@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME) public class BizResourceFileMethodNoveltySearchServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodNoveltySearchService { @Autowired private IBizResourceFileMethodNoveltySearchLogService noveltySearchLogService; @@ -152,6 +153,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileMethodNoveltySearch obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noveltyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("novelty_id", noveltyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java index 1546f0b..0b2b221 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java @@ -15,15 +15,12 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.system.FilePrintEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileRecallArchiveMapper; import com.casic.missiles.model.resource.BizResourceFileRecallArchive; import com.casic.missiles.model.resource.BizResourceFileRecallArchiveFile; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.service.flowable.ApprovalOperateService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveFileService; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveService; @@ -38,7 +35,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_RECALL_ARCHIVE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME; /** *

@@ -48,7 +47,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_RECALL_ARCHIVE_BEAN_NAME) public class BizResourceFileRecallArchiveServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileRecallArchiveService { @Autowired private IBizResourceFileRecallArchiveFileService recallArchiveFileService; @@ -160,6 +159,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileRecallArchive obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noticeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("archive_id", noticeId); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java index 1b876fb..61c8686 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java @@ -15,7 +15,6 @@ import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.model.resource.BizResourceFileApproval; import com.casic.missiles.model.resource.BizResourceFileApprovalFile; -import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceFileApprovalFileService; import com.casic.missiles.service.resource.IBizResourceFileApprovalService; @@ -26,6 +25,8 @@ import java.util.List; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_APPROVAL_BEAN_NAME; + /** *

* 资源管理-文件管理-文件审批(审批通过后的文件与体系/技术文件无关) 服务实现类 @@ -34,7 +35,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_APPROVAL_BEAN_NAME) public class BizResourceFileApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileApprovalService { @Autowired private SystemTemplateMapper templateMapper; @@ -121,4 +122,9 @@ // bizResourceFileApproval.setFileTemplateFile(systemTemplate.getMinioFileName()); return ReturnUtil.success(bizResourceFileApproval); } + + @Override + public void setBizName(BizResourceFileApproval obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index b8cedd8..9ffe522 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -36,6 +36,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_CHANGE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME; /** *

@@ -45,7 +46,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_CHANGE_FORM_BEAN_NAME) public class BizResourceFileChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileChangeService { @Autowired private IBizResourceFileChangeFileService changeFileService; @@ -160,6 +161,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileChange obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("change_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java index 800fe26..d408e06 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -17,17 +16,12 @@ import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.workbench.MessageSourceModuleEnum; -import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileGrantNoticeMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; import com.casic.missiles.model.resource.BizResourceFileGrantNoticeFile; import com.casic.missiles.model.resource.BizResourceStaffInfo; -import com.casic.missiles.model.resource.BizResourceStaffVerifier; -import com.casic.missiles.model.workbench.WorkbenchRemindMessage; -import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileGrantNoticeFileService; @@ -45,6 +39,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME; /** *

@@ -54,7 +49,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_GRANT_NOTICE_BEAN_NAME) public class BizResourceFileGrantNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileGrantNoticeService { @Autowired private IBizResourceFileGrantNoticeFileService grantNoticeFileService; @@ -207,4 +202,9 @@ return ReturnUtil.success(resourceStaffInfoList); } + @Override + public void setBizName(BizResourceFileGrantNotice obj) { + obj.setBizName(obj.getFormName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java index be97ba7..84b4384 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileMethodConfirmMapper; @@ -30,7 +29,9 @@ import javax.servlet.http.HttpServletResponse; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_METHOD_CONFIRM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME; /** *

@@ -40,7 +41,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_CONFIRM_BEAN_NAME) public class BizResourceFileMethodConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodConfirmService { @Autowired @@ -83,4 +84,9 @@ printFileRegister.registerPrintFile(RESOURCE_FILE_METHOD_CONFIRM, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizResourceFileMethodConfirm obj) { + obj.setBizName(obj.getFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java index 99ff716..066a925 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java @@ -25,7 +25,6 @@ import com.casic.missiles.service.resource.IBizResourceFileMethodNoveltySearchService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME; + /** *

* 资源管理-文件管理-测试校准检定方法查新记录表 服务实现类 @@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME) public class BizResourceFileMethodNoveltySearchServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodNoveltySearchService { @Autowired private IBizResourceFileMethodNoveltySearchLogService noveltySearchLogService; @@ -152,6 +153,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileMethodNoveltySearch obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noveltyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("novelty_id", noveltyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java index 1546f0b..0b2b221 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java @@ -15,15 +15,12 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.system.FilePrintEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileRecallArchiveMapper; import com.casic.missiles.model.resource.BizResourceFileRecallArchive; import com.casic.missiles.model.resource.BizResourceFileRecallArchiveFile; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.service.flowable.ApprovalOperateService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveFileService; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveService; @@ -38,7 +35,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_RECALL_ARCHIVE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME; /** *

@@ -48,7 +47,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_RECALL_ARCHIVE_BEAN_NAME) public class BizResourceFileRecallArchiveServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileRecallArchiveService { @Autowired private IBizResourceFileRecallArchiveFileService recallArchiveFileService; @@ -160,6 +159,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileRecallArchive obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noticeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("archive_id", noticeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java index 1102ccd..1eeacfb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java @@ -1,9 +1,7 @@ package com.casic.missiles.service.Impl.resource; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -11,7 +9,6 @@ import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.resource.seal.SealLogListRequest; import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest; import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -19,14 +16,12 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSealUseNoteMapper; -import com.casic.missiles.model.resource.BizResourceSealUseLog; import com.casic.missiles.model.resource.BizResourceSealUseNote; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceSealUseNoteService; import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,7 +30,9 @@ import java.util.List; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SEAL_USE_NOTE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SEAL_USE_BEAN_NAME; /** *

@@ -45,7 +42,7 @@ * @author wangpeng * @since 2023-07-28 */ -@Service +@Service(SEAL_USE_BEAN_NAME) public class BizResourceSealUseNoteServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSealUseNoteService { @Autowired @@ -95,4 +92,8 @@ } } + @Override + public void setBizName(BizResourceSealUseNote obj) { + obj.setBizName(obj.getNoteFormName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java index 1b876fb..61c8686 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java @@ -15,7 +15,6 @@ import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.model.resource.BizResourceFileApproval; import com.casic.missiles.model.resource.BizResourceFileApprovalFile; -import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceFileApprovalFileService; import com.casic.missiles.service.resource.IBizResourceFileApprovalService; @@ -26,6 +25,8 @@ import java.util.List; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_APPROVAL_BEAN_NAME; + /** *

* 资源管理-文件管理-文件审批(审批通过后的文件与体系/技术文件无关) 服务实现类 @@ -34,7 +35,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_APPROVAL_BEAN_NAME) public class BizResourceFileApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileApprovalService { @Autowired private SystemTemplateMapper templateMapper; @@ -121,4 +122,9 @@ // bizResourceFileApproval.setFileTemplateFile(systemTemplate.getMinioFileName()); return ReturnUtil.success(bizResourceFileApproval); } + + @Override + public void setBizName(BizResourceFileApproval obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index b8cedd8..9ffe522 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -36,6 +36,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_CHANGE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME; /** *

@@ -45,7 +46,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_CHANGE_FORM_BEAN_NAME) public class BizResourceFileChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileChangeService { @Autowired private IBizResourceFileChangeFileService changeFileService; @@ -160,6 +161,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileChange obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("change_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java index 800fe26..d408e06 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -17,17 +16,12 @@ import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.workbench.MessageSourceModuleEnum; -import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileGrantNoticeMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; import com.casic.missiles.model.resource.BizResourceFileGrantNoticeFile; import com.casic.missiles.model.resource.BizResourceStaffInfo; -import com.casic.missiles.model.resource.BizResourceStaffVerifier; -import com.casic.missiles.model.workbench.WorkbenchRemindMessage; -import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileGrantNoticeFileService; @@ -45,6 +39,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME; /** *

@@ -54,7 +49,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_GRANT_NOTICE_BEAN_NAME) public class BizResourceFileGrantNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileGrantNoticeService { @Autowired private IBizResourceFileGrantNoticeFileService grantNoticeFileService; @@ -207,4 +202,9 @@ return ReturnUtil.success(resourceStaffInfoList); } + @Override + public void setBizName(BizResourceFileGrantNotice obj) { + obj.setBizName(obj.getFormName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java index be97ba7..84b4384 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileMethodConfirmMapper; @@ -30,7 +29,9 @@ import javax.servlet.http.HttpServletResponse; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_METHOD_CONFIRM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME; /** *

@@ -40,7 +41,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_CONFIRM_BEAN_NAME) public class BizResourceFileMethodConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodConfirmService { @Autowired @@ -83,4 +84,9 @@ printFileRegister.registerPrintFile(RESOURCE_FILE_METHOD_CONFIRM, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizResourceFileMethodConfirm obj) { + obj.setBizName(obj.getFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java index 99ff716..066a925 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java @@ -25,7 +25,6 @@ import com.casic.missiles.service.resource.IBizResourceFileMethodNoveltySearchService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME; + /** *

* 资源管理-文件管理-测试校准检定方法查新记录表 服务实现类 @@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME) public class BizResourceFileMethodNoveltySearchServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodNoveltySearchService { @Autowired private IBizResourceFileMethodNoveltySearchLogService noveltySearchLogService; @@ -152,6 +153,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileMethodNoveltySearch obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noveltyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("novelty_id", noveltyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java index 1546f0b..0b2b221 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java @@ -15,15 +15,12 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.system.FilePrintEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileRecallArchiveMapper; import com.casic.missiles.model.resource.BizResourceFileRecallArchive; import com.casic.missiles.model.resource.BizResourceFileRecallArchiveFile; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.service.flowable.ApprovalOperateService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveFileService; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveService; @@ -38,7 +35,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_RECALL_ARCHIVE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME; /** *

@@ -48,7 +47,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_RECALL_ARCHIVE_BEAN_NAME) public class BizResourceFileRecallArchiveServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileRecallArchiveService { @Autowired private IBizResourceFileRecallArchiveFileService recallArchiveFileService; @@ -160,6 +159,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileRecallArchive obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noticeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("archive_id", noticeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java index 1102ccd..1eeacfb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java @@ -1,9 +1,7 @@ package com.casic.missiles.service.Impl.resource; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -11,7 +9,6 @@ import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.resource.seal.SealLogListRequest; import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest; import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -19,14 +16,12 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSealUseNoteMapper; -import com.casic.missiles.model.resource.BizResourceSealUseLog; import com.casic.missiles.model.resource.BizResourceSealUseNote; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceSealUseNoteService; import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,7 +30,9 @@ import java.util.List; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SEAL_USE_NOTE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SEAL_USE_BEAN_NAME; /** *

@@ -45,7 +42,7 @@ * @author wangpeng * @since 2023-07-28 */ -@Service +@Service(SEAL_USE_BEAN_NAME) public class BizResourceSealUseNoteServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSealUseNoteService { @Autowired @@ -95,4 +92,8 @@ } } + @Override + public void setBizName(BizResourceSealUseNote obj) { + obj.setBizName(obj.getNoteFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java index 9ff1881..403f910 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java @@ -35,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME; + /** *

* 在用软件管理-软件评审报告 服务实现类 @@ -43,7 +45,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVIEW_REPORT_BEAN_NAME) public class BizResourceSoftwareReviewReportServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareReviewReportService { @Autowired private IBizResourceSoftwareReviewReportStaffService reviewReportStaffService; @@ -150,6 +152,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSoftwareReviewReport obj) { + obj.setBizName(obj.getReportName()); + } + private void removeRelationData(Long reportId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("report_id", reportId); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java index 1b876fb..61c8686 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java @@ -15,7 +15,6 @@ import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.model.resource.BizResourceFileApproval; import com.casic.missiles.model.resource.BizResourceFileApprovalFile; -import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceFileApprovalFileService; import com.casic.missiles.service.resource.IBizResourceFileApprovalService; @@ -26,6 +25,8 @@ import java.util.List; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_APPROVAL_BEAN_NAME; + /** *

* 资源管理-文件管理-文件审批(审批通过后的文件与体系/技术文件无关) 服务实现类 @@ -34,7 +35,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_APPROVAL_BEAN_NAME) public class BizResourceFileApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileApprovalService { @Autowired private SystemTemplateMapper templateMapper; @@ -121,4 +122,9 @@ // bizResourceFileApproval.setFileTemplateFile(systemTemplate.getMinioFileName()); return ReturnUtil.success(bizResourceFileApproval); } + + @Override + public void setBizName(BizResourceFileApproval obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index b8cedd8..9ffe522 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -36,6 +36,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_CHANGE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME; /** *

@@ -45,7 +46,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_CHANGE_FORM_BEAN_NAME) public class BizResourceFileChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileChangeService { @Autowired private IBizResourceFileChangeFileService changeFileService; @@ -160,6 +161,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileChange obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("change_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java index 800fe26..d408e06 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -17,17 +16,12 @@ import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.workbench.MessageSourceModuleEnum; -import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileGrantNoticeMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; import com.casic.missiles.model.resource.BizResourceFileGrantNoticeFile; import com.casic.missiles.model.resource.BizResourceStaffInfo; -import com.casic.missiles.model.resource.BizResourceStaffVerifier; -import com.casic.missiles.model.workbench.WorkbenchRemindMessage; -import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileGrantNoticeFileService; @@ -45,6 +39,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME; /** *

@@ -54,7 +49,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_GRANT_NOTICE_BEAN_NAME) public class BizResourceFileGrantNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileGrantNoticeService { @Autowired private IBizResourceFileGrantNoticeFileService grantNoticeFileService; @@ -207,4 +202,9 @@ return ReturnUtil.success(resourceStaffInfoList); } + @Override + public void setBizName(BizResourceFileGrantNotice obj) { + obj.setBizName(obj.getFormName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java index be97ba7..84b4384 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileMethodConfirmMapper; @@ -30,7 +29,9 @@ import javax.servlet.http.HttpServletResponse; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_METHOD_CONFIRM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME; /** *

@@ -40,7 +41,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_CONFIRM_BEAN_NAME) public class BizResourceFileMethodConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodConfirmService { @Autowired @@ -83,4 +84,9 @@ printFileRegister.registerPrintFile(RESOURCE_FILE_METHOD_CONFIRM, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizResourceFileMethodConfirm obj) { + obj.setBizName(obj.getFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java index 99ff716..066a925 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java @@ -25,7 +25,6 @@ import com.casic.missiles.service.resource.IBizResourceFileMethodNoveltySearchService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME; + /** *

* 资源管理-文件管理-测试校准检定方法查新记录表 服务实现类 @@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME) public class BizResourceFileMethodNoveltySearchServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodNoveltySearchService { @Autowired private IBizResourceFileMethodNoveltySearchLogService noveltySearchLogService; @@ -152,6 +153,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileMethodNoveltySearch obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noveltyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("novelty_id", noveltyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java index 1546f0b..0b2b221 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java @@ -15,15 +15,12 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.system.FilePrintEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileRecallArchiveMapper; import com.casic.missiles.model.resource.BizResourceFileRecallArchive; import com.casic.missiles.model.resource.BizResourceFileRecallArchiveFile; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.service.flowable.ApprovalOperateService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveFileService; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveService; @@ -38,7 +35,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_RECALL_ARCHIVE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME; /** *

@@ -48,7 +47,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_RECALL_ARCHIVE_BEAN_NAME) public class BizResourceFileRecallArchiveServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileRecallArchiveService { @Autowired private IBizResourceFileRecallArchiveFileService recallArchiveFileService; @@ -160,6 +159,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileRecallArchive obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noticeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("archive_id", noticeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java index 1102ccd..1eeacfb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java @@ -1,9 +1,7 @@ package com.casic.missiles.service.Impl.resource; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -11,7 +9,6 @@ import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.resource.seal.SealLogListRequest; import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest; import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -19,14 +16,12 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSealUseNoteMapper; -import com.casic.missiles.model.resource.BizResourceSealUseLog; import com.casic.missiles.model.resource.BizResourceSealUseNote; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceSealUseNoteService; import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,7 +30,9 @@ import java.util.List; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SEAL_USE_NOTE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SEAL_USE_BEAN_NAME; /** *

@@ -45,7 +42,7 @@ * @author wangpeng * @since 2023-07-28 */ -@Service +@Service(SEAL_USE_BEAN_NAME) public class BizResourceSealUseNoteServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSealUseNoteService { @Autowired @@ -95,4 +92,8 @@ } } + @Override + public void setBizName(BizResourceSealUseNote obj) { + obj.setBizName(obj.getNoteFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java index 9ff1881..403f910 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java @@ -35,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME; + /** *

* 在用软件管理-软件评审报告 服务实现类 @@ -43,7 +45,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVIEW_REPORT_BEAN_NAME) public class BizResourceSoftwareReviewReportServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareReviewReportService { @Autowired private IBizResourceSoftwareReviewReportStaffService reviewReportStaffService; @@ -150,6 +152,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSoftwareReviewReport obj) { + obj.setBizName(obj.getReportName()); + } + private void removeRelationData(Long reportId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("report_id", reportId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java index 451a4fb..5b7b654 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java @@ -29,6 +29,8 @@ import javax.validation.Valid; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME; + /** *

* 在用软件管理-软件修订申请 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVISION_APPLY_BEAN_NAME) public class BizResourceSoftwareRevisionApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareRevisionApplyService { @Autowired @@ -80,5 +82,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.SOFTWARE_REVISION_REQUEST, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } - + @Override + public void setBizName(BizResourceSoftwareRevisionApply obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java index 1b876fb..61c8686 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java @@ -15,7 +15,6 @@ import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.model.resource.BizResourceFileApproval; import com.casic.missiles.model.resource.BizResourceFileApprovalFile; -import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceFileApprovalFileService; import com.casic.missiles.service.resource.IBizResourceFileApprovalService; @@ -26,6 +25,8 @@ import java.util.List; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_APPROVAL_BEAN_NAME; + /** *

* 资源管理-文件管理-文件审批(审批通过后的文件与体系/技术文件无关) 服务实现类 @@ -34,7 +35,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_APPROVAL_BEAN_NAME) public class BizResourceFileApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileApprovalService { @Autowired private SystemTemplateMapper templateMapper; @@ -121,4 +122,9 @@ // bizResourceFileApproval.setFileTemplateFile(systemTemplate.getMinioFileName()); return ReturnUtil.success(bizResourceFileApproval); } + + @Override + public void setBizName(BizResourceFileApproval obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index b8cedd8..9ffe522 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -36,6 +36,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_CHANGE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME; /** *

@@ -45,7 +46,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_CHANGE_FORM_BEAN_NAME) public class BizResourceFileChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileChangeService { @Autowired private IBizResourceFileChangeFileService changeFileService; @@ -160,6 +161,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileChange obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("change_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java index 800fe26..d408e06 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -17,17 +16,12 @@ import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.workbench.MessageSourceModuleEnum; -import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileGrantNoticeMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; import com.casic.missiles.model.resource.BizResourceFileGrantNoticeFile; import com.casic.missiles.model.resource.BizResourceStaffInfo; -import com.casic.missiles.model.resource.BizResourceStaffVerifier; -import com.casic.missiles.model.workbench.WorkbenchRemindMessage; -import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileGrantNoticeFileService; @@ -45,6 +39,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME; /** *

@@ -54,7 +49,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_GRANT_NOTICE_BEAN_NAME) public class BizResourceFileGrantNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileGrantNoticeService { @Autowired private IBizResourceFileGrantNoticeFileService grantNoticeFileService; @@ -207,4 +202,9 @@ return ReturnUtil.success(resourceStaffInfoList); } + @Override + public void setBizName(BizResourceFileGrantNotice obj) { + obj.setBizName(obj.getFormName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java index be97ba7..84b4384 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileMethodConfirmMapper; @@ -30,7 +29,9 @@ import javax.servlet.http.HttpServletResponse; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_METHOD_CONFIRM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME; /** *

@@ -40,7 +41,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_CONFIRM_BEAN_NAME) public class BizResourceFileMethodConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodConfirmService { @Autowired @@ -83,4 +84,9 @@ printFileRegister.registerPrintFile(RESOURCE_FILE_METHOD_CONFIRM, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizResourceFileMethodConfirm obj) { + obj.setBizName(obj.getFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java index 99ff716..066a925 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java @@ -25,7 +25,6 @@ import com.casic.missiles.service.resource.IBizResourceFileMethodNoveltySearchService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME; + /** *

* 资源管理-文件管理-测试校准检定方法查新记录表 服务实现类 @@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME) public class BizResourceFileMethodNoveltySearchServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodNoveltySearchService { @Autowired private IBizResourceFileMethodNoveltySearchLogService noveltySearchLogService; @@ -152,6 +153,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileMethodNoveltySearch obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noveltyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("novelty_id", noveltyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java index 1546f0b..0b2b221 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java @@ -15,15 +15,12 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.system.FilePrintEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileRecallArchiveMapper; import com.casic.missiles.model.resource.BizResourceFileRecallArchive; import com.casic.missiles.model.resource.BizResourceFileRecallArchiveFile; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.service.flowable.ApprovalOperateService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveFileService; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveService; @@ -38,7 +35,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_RECALL_ARCHIVE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME; /** *

@@ -48,7 +47,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_RECALL_ARCHIVE_BEAN_NAME) public class BizResourceFileRecallArchiveServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileRecallArchiveService { @Autowired private IBizResourceFileRecallArchiveFileService recallArchiveFileService; @@ -160,6 +159,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileRecallArchive obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noticeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("archive_id", noticeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java index 1102ccd..1eeacfb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java @@ -1,9 +1,7 @@ package com.casic.missiles.service.Impl.resource; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -11,7 +9,6 @@ import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.resource.seal.SealLogListRequest; import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest; import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -19,14 +16,12 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSealUseNoteMapper; -import com.casic.missiles.model.resource.BizResourceSealUseLog; import com.casic.missiles.model.resource.BizResourceSealUseNote; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceSealUseNoteService; import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,7 +30,9 @@ import java.util.List; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SEAL_USE_NOTE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SEAL_USE_BEAN_NAME; /** *

@@ -45,7 +42,7 @@ * @author wangpeng * @since 2023-07-28 */ -@Service +@Service(SEAL_USE_BEAN_NAME) public class BizResourceSealUseNoteServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSealUseNoteService { @Autowired @@ -95,4 +92,8 @@ } } + @Override + public void setBizName(BizResourceSealUseNote obj) { + obj.setBizName(obj.getNoteFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java index 9ff1881..403f910 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java @@ -35,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME; + /** *

* 在用软件管理-软件评审报告 服务实现类 @@ -43,7 +45,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVIEW_REPORT_BEAN_NAME) public class BizResourceSoftwareReviewReportServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareReviewReportService { @Autowired private IBizResourceSoftwareReviewReportStaffService reviewReportStaffService; @@ -150,6 +152,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSoftwareReviewReport obj) { + obj.setBizName(obj.getReportName()); + } + private void removeRelationData(Long reportId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("report_id", reportId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java index 451a4fb..5b7b654 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java @@ -29,6 +29,8 @@ import javax.validation.Valid; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME; + /** *

* 在用软件管理-软件修订申请 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVISION_APPLY_BEAN_NAME) public class BizResourceSoftwareRevisionApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareRevisionApplyService { @Autowired @@ -80,5 +82,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.SOFTWARE_REVISION_REQUEST, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } - + @Override + public void setBizName(BizResourceSoftwareRevisionApply obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java index 878ce47..ec0db87 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java @@ -35,6 +35,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CONSUMABLE_GOODS_APPLY_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME; /** *

@@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-18 */ -@Service +@Service(CONSUMABLE_GOODS_APPLY_BEAN_NAME) public class BizResourceSupplierConsumableGoodsApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsApplyService { @Autowired private IBizResourceSupplierConsumableGoodsDetailService goodsDetailService; @@ -156,6 +157,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsApply obj) { + obj.setBizName(obj.getApplyName()); + } + private void removeRelationData(Long applyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id", applyId); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java index 1b876fb..61c8686 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java @@ -15,7 +15,6 @@ import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.model.resource.BizResourceFileApproval; import com.casic.missiles.model.resource.BizResourceFileApprovalFile; -import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceFileApprovalFileService; import com.casic.missiles.service.resource.IBizResourceFileApprovalService; @@ -26,6 +25,8 @@ import java.util.List; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_APPROVAL_BEAN_NAME; + /** *

* 资源管理-文件管理-文件审批(审批通过后的文件与体系/技术文件无关) 服务实现类 @@ -34,7 +35,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_APPROVAL_BEAN_NAME) public class BizResourceFileApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileApprovalService { @Autowired private SystemTemplateMapper templateMapper; @@ -121,4 +122,9 @@ // bizResourceFileApproval.setFileTemplateFile(systemTemplate.getMinioFileName()); return ReturnUtil.success(bizResourceFileApproval); } + + @Override + public void setBizName(BizResourceFileApproval obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index b8cedd8..9ffe522 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -36,6 +36,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_CHANGE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME; /** *

@@ -45,7 +46,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_CHANGE_FORM_BEAN_NAME) public class BizResourceFileChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileChangeService { @Autowired private IBizResourceFileChangeFileService changeFileService; @@ -160,6 +161,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileChange obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("change_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java index 800fe26..d408e06 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -17,17 +16,12 @@ import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.workbench.MessageSourceModuleEnum; -import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileGrantNoticeMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; import com.casic.missiles.model.resource.BizResourceFileGrantNoticeFile; import com.casic.missiles.model.resource.BizResourceStaffInfo; -import com.casic.missiles.model.resource.BizResourceStaffVerifier; -import com.casic.missiles.model.workbench.WorkbenchRemindMessage; -import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileGrantNoticeFileService; @@ -45,6 +39,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME; /** *

@@ -54,7 +49,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_GRANT_NOTICE_BEAN_NAME) public class BizResourceFileGrantNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileGrantNoticeService { @Autowired private IBizResourceFileGrantNoticeFileService grantNoticeFileService; @@ -207,4 +202,9 @@ return ReturnUtil.success(resourceStaffInfoList); } + @Override + public void setBizName(BizResourceFileGrantNotice obj) { + obj.setBizName(obj.getFormName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java index be97ba7..84b4384 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileMethodConfirmMapper; @@ -30,7 +29,9 @@ import javax.servlet.http.HttpServletResponse; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_METHOD_CONFIRM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME; /** *

@@ -40,7 +41,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_CONFIRM_BEAN_NAME) public class BizResourceFileMethodConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodConfirmService { @Autowired @@ -83,4 +84,9 @@ printFileRegister.registerPrintFile(RESOURCE_FILE_METHOD_CONFIRM, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizResourceFileMethodConfirm obj) { + obj.setBizName(obj.getFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java index 99ff716..066a925 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java @@ -25,7 +25,6 @@ import com.casic.missiles.service.resource.IBizResourceFileMethodNoveltySearchService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME; + /** *

* 资源管理-文件管理-测试校准检定方法查新记录表 服务实现类 @@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME) public class BizResourceFileMethodNoveltySearchServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodNoveltySearchService { @Autowired private IBizResourceFileMethodNoveltySearchLogService noveltySearchLogService; @@ -152,6 +153,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileMethodNoveltySearch obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noveltyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("novelty_id", noveltyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java index 1546f0b..0b2b221 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java @@ -15,15 +15,12 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.system.FilePrintEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileRecallArchiveMapper; import com.casic.missiles.model.resource.BizResourceFileRecallArchive; import com.casic.missiles.model.resource.BizResourceFileRecallArchiveFile; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.service.flowable.ApprovalOperateService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveFileService; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveService; @@ -38,7 +35,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_RECALL_ARCHIVE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME; /** *

@@ -48,7 +47,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_RECALL_ARCHIVE_BEAN_NAME) public class BizResourceFileRecallArchiveServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileRecallArchiveService { @Autowired private IBizResourceFileRecallArchiveFileService recallArchiveFileService; @@ -160,6 +159,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileRecallArchive obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noticeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("archive_id", noticeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java index 1102ccd..1eeacfb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java @@ -1,9 +1,7 @@ package com.casic.missiles.service.Impl.resource; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -11,7 +9,6 @@ import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.resource.seal.SealLogListRequest; import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest; import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -19,14 +16,12 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSealUseNoteMapper; -import com.casic.missiles.model.resource.BizResourceSealUseLog; import com.casic.missiles.model.resource.BizResourceSealUseNote; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceSealUseNoteService; import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,7 +30,9 @@ import java.util.List; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SEAL_USE_NOTE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SEAL_USE_BEAN_NAME; /** *

@@ -45,7 +42,7 @@ * @author wangpeng * @since 2023-07-28 */ -@Service +@Service(SEAL_USE_BEAN_NAME) public class BizResourceSealUseNoteServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSealUseNoteService { @Autowired @@ -95,4 +92,8 @@ } } + @Override + public void setBizName(BizResourceSealUseNote obj) { + obj.setBizName(obj.getNoteFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java index 9ff1881..403f910 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java @@ -35,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME; + /** *

* 在用软件管理-软件评审报告 服务实现类 @@ -43,7 +45,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVIEW_REPORT_BEAN_NAME) public class BizResourceSoftwareReviewReportServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareReviewReportService { @Autowired private IBizResourceSoftwareReviewReportStaffService reviewReportStaffService; @@ -150,6 +152,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSoftwareReviewReport obj) { + obj.setBizName(obj.getReportName()); + } + private void removeRelationData(Long reportId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("report_id", reportId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java index 451a4fb..5b7b654 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java @@ -29,6 +29,8 @@ import javax.validation.Valid; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME; + /** *

* 在用软件管理-软件修订申请 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVISION_APPLY_BEAN_NAME) public class BizResourceSoftwareRevisionApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareRevisionApplyService { @Autowired @@ -80,5 +82,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.SOFTWARE_REVISION_REQUEST, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } - + @Override + public void setBizName(BizResourceSoftwareRevisionApply obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java index 878ce47..ec0db87 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java @@ -35,6 +35,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CONSUMABLE_GOODS_APPLY_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME; /** *

@@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-18 */ -@Service +@Service(CONSUMABLE_GOODS_APPLY_BEAN_NAME) public class BizResourceSupplierConsumableGoodsApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsApplyService { @Autowired private IBizResourceSupplierConsumableGoodsDetailService goodsDetailService; @@ -156,6 +157,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsApply obj) { + obj.setBizName(obj.getApplyName()); + } + private void removeRelationData(Long applyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id", applyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java index e12dc77..6fb275c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java @@ -18,7 +18,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierConsumableGoodsEvaluateMapper; @@ -39,7 +38,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_CONSUMABLE_GOODS_EVALUATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME; /** *

@@ -49,7 +50,7 @@ * @author wangpeng * @since 2023-09-21 */ -@Service +@Service(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME) public class BizResourceSupplierConsumableGoodsEvaluateServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsEvaluateService { @Autowired private IBizResourceSupplierConsumableGoodsEvaluateContentService goodsEvaluateContentService; @@ -169,6 +170,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsEvaluate obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long formId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("form_id", formId); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java index 1b876fb..61c8686 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java @@ -15,7 +15,6 @@ import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.model.resource.BizResourceFileApproval; import com.casic.missiles.model.resource.BizResourceFileApprovalFile; -import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceFileApprovalFileService; import com.casic.missiles.service.resource.IBizResourceFileApprovalService; @@ -26,6 +25,8 @@ import java.util.List; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_APPROVAL_BEAN_NAME; + /** *

* 资源管理-文件管理-文件审批(审批通过后的文件与体系/技术文件无关) 服务实现类 @@ -34,7 +35,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_APPROVAL_BEAN_NAME) public class BizResourceFileApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileApprovalService { @Autowired private SystemTemplateMapper templateMapper; @@ -121,4 +122,9 @@ // bizResourceFileApproval.setFileTemplateFile(systemTemplate.getMinioFileName()); return ReturnUtil.success(bizResourceFileApproval); } + + @Override + public void setBizName(BizResourceFileApproval obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index b8cedd8..9ffe522 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -36,6 +36,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_CHANGE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME; /** *

@@ -45,7 +46,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_CHANGE_FORM_BEAN_NAME) public class BizResourceFileChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileChangeService { @Autowired private IBizResourceFileChangeFileService changeFileService; @@ -160,6 +161,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileChange obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("change_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java index 800fe26..d408e06 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -17,17 +16,12 @@ import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.workbench.MessageSourceModuleEnum; -import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileGrantNoticeMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; import com.casic.missiles.model.resource.BizResourceFileGrantNoticeFile; import com.casic.missiles.model.resource.BizResourceStaffInfo; -import com.casic.missiles.model.resource.BizResourceStaffVerifier; -import com.casic.missiles.model.workbench.WorkbenchRemindMessage; -import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileGrantNoticeFileService; @@ -45,6 +39,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME; /** *

@@ -54,7 +49,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_GRANT_NOTICE_BEAN_NAME) public class BizResourceFileGrantNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileGrantNoticeService { @Autowired private IBizResourceFileGrantNoticeFileService grantNoticeFileService; @@ -207,4 +202,9 @@ return ReturnUtil.success(resourceStaffInfoList); } + @Override + public void setBizName(BizResourceFileGrantNotice obj) { + obj.setBizName(obj.getFormName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java index be97ba7..84b4384 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileMethodConfirmMapper; @@ -30,7 +29,9 @@ import javax.servlet.http.HttpServletResponse; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_METHOD_CONFIRM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME; /** *

@@ -40,7 +41,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_CONFIRM_BEAN_NAME) public class BizResourceFileMethodConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodConfirmService { @Autowired @@ -83,4 +84,9 @@ printFileRegister.registerPrintFile(RESOURCE_FILE_METHOD_CONFIRM, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizResourceFileMethodConfirm obj) { + obj.setBizName(obj.getFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java index 99ff716..066a925 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java @@ -25,7 +25,6 @@ import com.casic.missiles.service.resource.IBizResourceFileMethodNoveltySearchService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME; + /** *

* 资源管理-文件管理-测试校准检定方法查新记录表 服务实现类 @@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME) public class BizResourceFileMethodNoveltySearchServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodNoveltySearchService { @Autowired private IBizResourceFileMethodNoveltySearchLogService noveltySearchLogService; @@ -152,6 +153,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileMethodNoveltySearch obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noveltyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("novelty_id", noveltyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java index 1546f0b..0b2b221 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java @@ -15,15 +15,12 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.system.FilePrintEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileRecallArchiveMapper; import com.casic.missiles.model.resource.BizResourceFileRecallArchive; import com.casic.missiles.model.resource.BizResourceFileRecallArchiveFile; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.service.flowable.ApprovalOperateService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveFileService; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveService; @@ -38,7 +35,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_RECALL_ARCHIVE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME; /** *

@@ -48,7 +47,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_RECALL_ARCHIVE_BEAN_NAME) public class BizResourceFileRecallArchiveServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileRecallArchiveService { @Autowired private IBizResourceFileRecallArchiveFileService recallArchiveFileService; @@ -160,6 +159,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileRecallArchive obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noticeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("archive_id", noticeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java index 1102ccd..1eeacfb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java @@ -1,9 +1,7 @@ package com.casic.missiles.service.Impl.resource; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -11,7 +9,6 @@ import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.resource.seal.SealLogListRequest; import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest; import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -19,14 +16,12 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSealUseNoteMapper; -import com.casic.missiles.model.resource.BizResourceSealUseLog; import com.casic.missiles.model.resource.BizResourceSealUseNote; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceSealUseNoteService; import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,7 +30,9 @@ import java.util.List; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SEAL_USE_NOTE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SEAL_USE_BEAN_NAME; /** *

@@ -45,7 +42,7 @@ * @author wangpeng * @since 2023-07-28 */ -@Service +@Service(SEAL_USE_BEAN_NAME) public class BizResourceSealUseNoteServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSealUseNoteService { @Autowired @@ -95,4 +92,8 @@ } } + @Override + public void setBizName(BizResourceSealUseNote obj) { + obj.setBizName(obj.getNoteFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java index 9ff1881..403f910 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java @@ -35,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME; + /** *

* 在用软件管理-软件评审报告 服务实现类 @@ -43,7 +45,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVIEW_REPORT_BEAN_NAME) public class BizResourceSoftwareReviewReportServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareReviewReportService { @Autowired private IBizResourceSoftwareReviewReportStaffService reviewReportStaffService; @@ -150,6 +152,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSoftwareReviewReport obj) { + obj.setBizName(obj.getReportName()); + } + private void removeRelationData(Long reportId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("report_id", reportId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java index 451a4fb..5b7b654 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java @@ -29,6 +29,8 @@ import javax.validation.Valid; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME; + /** *

* 在用软件管理-软件修订申请 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVISION_APPLY_BEAN_NAME) public class BizResourceSoftwareRevisionApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareRevisionApplyService { @Autowired @@ -80,5 +82,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.SOFTWARE_REVISION_REQUEST, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } - + @Override + public void setBizName(BizResourceSoftwareRevisionApply obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java index 878ce47..ec0db87 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java @@ -35,6 +35,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CONSUMABLE_GOODS_APPLY_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME; /** *

@@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-18 */ -@Service +@Service(CONSUMABLE_GOODS_APPLY_BEAN_NAME) public class BizResourceSupplierConsumableGoodsApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsApplyService { @Autowired private IBizResourceSupplierConsumableGoodsDetailService goodsDetailService; @@ -156,6 +157,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsApply obj) { + obj.setBizName(obj.getApplyName()); + } + private void removeRelationData(Long applyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id", applyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java index e12dc77..6fb275c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java @@ -18,7 +18,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierConsumableGoodsEvaluateMapper; @@ -39,7 +38,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_CONSUMABLE_GOODS_EVALUATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME; /** *

@@ -49,7 +50,7 @@ * @author wangpeng * @since 2023-09-21 */ -@Service +@Service(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME) public class BizResourceSupplierConsumableGoodsEvaluateServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsEvaluateService { @Autowired private IBizResourceSupplierConsumableGoodsEvaluateContentService goodsEvaluateContentService; @@ -169,6 +170,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsEvaluate obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long formId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("form_id", formId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java index f7cf0a5..d71c951 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java @@ -17,7 +17,6 @@ import com.casic.missiles.dto.resource.supplier.SupplierConsumableGoodsUseSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierConsumableGoodsUseMapper; @@ -38,7 +37,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_CONSUMABLE_GOODS_USE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME; /** *

@@ -48,7 +49,7 @@ * @author wangpeng * @since 2023-09-20 */ -@Service +@Service(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME) public class BizResourceSupplierConsumableGoodsUseServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsUseService { @Autowired private IBizResourceSupplierConsumableGoodsUseDetailService goodsUseDetailService; @@ -163,6 +164,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsUse obj) { + obj.setBizName(obj.getRecordName()); + } + private void removeRelationData(Long recordId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("record_id", recordId); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java index 1b876fb..61c8686 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java @@ -15,7 +15,6 @@ import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.model.resource.BizResourceFileApproval; import com.casic.missiles.model.resource.BizResourceFileApprovalFile; -import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceFileApprovalFileService; import com.casic.missiles.service.resource.IBizResourceFileApprovalService; @@ -26,6 +25,8 @@ import java.util.List; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_APPROVAL_BEAN_NAME; + /** *

* 资源管理-文件管理-文件审批(审批通过后的文件与体系/技术文件无关) 服务实现类 @@ -34,7 +35,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_APPROVAL_BEAN_NAME) public class BizResourceFileApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileApprovalService { @Autowired private SystemTemplateMapper templateMapper; @@ -121,4 +122,9 @@ // bizResourceFileApproval.setFileTemplateFile(systemTemplate.getMinioFileName()); return ReturnUtil.success(bizResourceFileApproval); } + + @Override + public void setBizName(BizResourceFileApproval obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index b8cedd8..9ffe522 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -36,6 +36,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_CHANGE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME; /** *

@@ -45,7 +46,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_CHANGE_FORM_BEAN_NAME) public class BizResourceFileChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileChangeService { @Autowired private IBizResourceFileChangeFileService changeFileService; @@ -160,6 +161,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileChange obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("change_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java index 800fe26..d408e06 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -17,17 +16,12 @@ import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.workbench.MessageSourceModuleEnum; -import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileGrantNoticeMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; import com.casic.missiles.model.resource.BizResourceFileGrantNoticeFile; import com.casic.missiles.model.resource.BizResourceStaffInfo; -import com.casic.missiles.model.resource.BizResourceStaffVerifier; -import com.casic.missiles.model.workbench.WorkbenchRemindMessage; -import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileGrantNoticeFileService; @@ -45,6 +39,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME; /** *

@@ -54,7 +49,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_GRANT_NOTICE_BEAN_NAME) public class BizResourceFileGrantNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileGrantNoticeService { @Autowired private IBizResourceFileGrantNoticeFileService grantNoticeFileService; @@ -207,4 +202,9 @@ return ReturnUtil.success(resourceStaffInfoList); } + @Override + public void setBizName(BizResourceFileGrantNotice obj) { + obj.setBizName(obj.getFormName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java index be97ba7..84b4384 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileMethodConfirmMapper; @@ -30,7 +29,9 @@ import javax.servlet.http.HttpServletResponse; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_METHOD_CONFIRM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME; /** *

@@ -40,7 +41,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_CONFIRM_BEAN_NAME) public class BizResourceFileMethodConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodConfirmService { @Autowired @@ -83,4 +84,9 @@ printFileRegister.registerPrintFile(RESOURCE_FILE_METHOD_CONFIRM, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizResourceFileMethodConfirm obj) { + obj.setBizName(obj.getFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java index 99ff716..066a925 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java @@ -25,7 +25,6 @@ import com.casic.missiles.service.resource.IBizResourceFileMethodNoveltySearchService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME; + /** *

* 资源管理-文件管理-测试校准检定方法查新记录表 服务实现类 @@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME) public class BizResourceFileMethodNoveltySearchServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodNoveltySearchService { @Autowired private IBizResourceFileMethodNoveltySearchLogService noveltySearchLogService; @@ -152,6 +153,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileMethodNoveltySearch obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noveltyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("novelty_id", noveltyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java index 1546f0b..0b2b221 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java @@ -15,15 +15,12 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.system.FilePrintEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileRecallArchiveMapper; import com.casic.missiles.model.resource.BizResourceFileRecallArchive; import com.casic.missiles.model.resource.BizResourceFileRecallArchiveFile; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.service.flowable.ApprovalOperateService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveFileService; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveService; @@ -38,7 +35,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_RECALL_ARCHIVE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME; /** *

@@ -48,7 +47,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_RECALL_ARCHIVE_BEAN_NAME) public class BizResourceFileRecallArchiveServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileRecallArchiveService { @Autowired private IBizResourceFileRecallArchiveFileService recallArchiveFileService; @@ -160,6 +159,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileRecallArchive obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noticeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("archive_id", noticeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java index 1102ccd..1eeacfb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java @@ -1,9 +1,7 @@ package com.casic.missiles.service.Impl.resource; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -11,7 +9,6 @@ import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.resource.seal.SealLogListRequest; import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest; import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -19,14 +16,12 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSealUseNoteMapper; -import com.casic.missiles.model.resource.BizResourceSealUseLog; import com.casic.missiles.model.resource.BizResourceSealUseNote; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceSealUseNoteService; import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,7 +30,9 @@ import java.util.List; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SEAL_USE_NOTE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SEAL_USE_BEAN_NAME; /** *

@@ -45,7 +42,7 @@ * @author wangpeng * @since 2023-07-28 */ -@Service +@Service(SEAL_USE_BEAN_NAME) public class BizResourceSealUseNoteServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSealUseNoteService { @Autowired @@ -95,4 +92,8 @@ } } + @Override + public void setBizName(BizResourceSealUseNote obj) { + obj.setBizName(obj.getNoteFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java index 9ff1881..403f910 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java @@ -35,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME; + /** *

* 在用软件管理-软件评审报告 服务实现类 @@ -43,7 +45,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVIEW_REPORT_BEAN_NAME) public class BizResourceSoftwareReviewReportServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareReviewReportService { @Autowired private IBizResourceSoftwareReviewReportStaffService reviewReportStaffService; @@ -150,6 +152,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSoftwareReviewReport obj) { + obj.setBizName(obj.getReportName()); + } + private void removeRelationData(Long reportId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("report_id", reportId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java index 451a4fb..5b7b654 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java @@ -29,6 +29,8 @@ import javax.validation.Valid; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME; + /** *

* 在用软件管理-软件修订申请 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVISION_APPLY_BEAN_NAME) public class BizResourceSoftwareRevisionApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareRevisionApplyService { @Autowired @@ -80,5 +82,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.SOFTWARE_REVISION_REQUEST, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } - + @Override + public void setBizName(BizResourceSoftwareRevisionApply obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java index 878ce47..ec0db87 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java @@ -35,6 +35,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CONSUMABLE_GOODS_APPLY_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME; /** *

@@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-18 */ -@Service +@Service(CONSUMABLE_GOODS_APPLY_BEAN_NAME) public class BizResourceSupplierConsumableGoodsApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsApplyService { @Autowired private IBizResourceSupplierConsumableGoodsDetailService goodsDetailService; @@ -156,6 +157,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsApply obj) { + obj.setBizName(obj.getApplyName()); + } + private void removeRelationData(Long applyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id", applyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java index e12dc77..6fb275c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java @@ -18,7 +18,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierConsumableGoodsEvaluateMapper; @@ -39,7 +38,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_CONSUMABLE_GOODS_EVALUATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME; /** *

@@ -49,7 +50,7 @@ * @author wangpeng * @since 2023-09-21 */ -@Service +@Service(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME) public class BizResourceSupplierConsumableGoodsEvaluateServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsEvaluateService { @Autowired private IBizResourceSupplierConsumableGoodsEvaluateContentService goodsEvaluateContentService; @@ -169,6 +170,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsEvaluate obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long formId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("form_id", formId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java index f7cf0a5..d71c951 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java @@ -17,7 +17,6 @@ import com.casic.missiles.dto.resource.supplier.SupplierConsumableGoodsUseSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierConsumableGoodsUseMapper; @@ -38,7 +37,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_CONSUMABLE_GOODS_USE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME; /** *

@@ -48,7 +49,7 @@ * @author wangpeng * @since 2023-09-20 */ -@Service +@Service(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME) public class BizResourceSupplierConsumableGoodsUseServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsUseService { @Autowired private IBizResourceSupplierConsumableGoodsUseDetailService goodsUseDetailService; @@ -163,6 +164,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsUse obj) { + obj.setBizName(obj.getRecordName()); + } + private void removeRelationData(Long recordId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("record_id", recordId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java index f0f6d47..ba436a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java @@ -18,7 +18,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierEvaluateMapper; @@ -35,11 +34,13 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; -import java.util.stream.Collectors; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_EVALUATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME; /** *

@@ -49,7 +50,7 @@ * @author wangpeng * @since 2023-09-21 */ -@Service +@Service(SUPPLIER_EVALUATE_BEAN_NAME) public class BizResourceSupplierEvaluateServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierEvaluateService { @Autowired private IBizResourceSupplierEvaluateContentService evaluateContentService; @@ -180,6 +181,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierEvaluate obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long formId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("form_id", formId); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java index 1b876fb..61c8686 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java @@ -15,7 +15,6 @@ import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.model.resource.BizResourceFileApproval; import com.casic.missiles.model.resource.BizResourceFileApprovalFile; -import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceFileApprovalFileService; import com.casic.missiles.service.resource.IBizResourceFileApprovalService; @@ -26,6 +25,8 @@ import java.util.List; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_APPROVAL_BEAN_NAME; + /** *

* 资源管理-文件管理-文件审批(审批通过后的文件与体系/技术文件无关) 服务实现类 @@ -34,7 +35,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_APPROVAL_BEAN_NAME) public class BizResourceFileApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileApprovalService { @Autowired private SystemTemplateMapper templateMapper; @@ -121,4 +122,9 @@ // bizResourceFileApproval.setFileTemplateFile(systemTemplate.getMinioFileName()); return ReturnUtil.success(bizResourceFileApproval); } + + @Override + public void setBizName(BizResourceFileApproval obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index b8cedd8..9ffe522 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -36,6 +36,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_CHANGE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME; /** *

@@ -45,7 +46,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_CHANGE_FORM_BEAN_NAME) public class BizResourceFileChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileChangeService { @Autowired private IBizResourceFileChangeFileService changeFileService; @@ -160,6 +161,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileChange obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("change_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java index 800fe26..d408e06 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -17,17 +16,12 @@ import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.workbench.MessageSourceModuleEnum; -import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileGrantNoticeMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; import com.casic.missiles.model.resource.BizResourceFileGrantNoticeFile; import com.casic.missiles.model.resource.BizResourceStaffInfo; -import com.casic.missiles.model.resource.BizResourceStaffVerifier; -import com.casic.missiles.model.workbench.WorkbenchRemindMessage; -import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileGrantNoticeFileService; @@ -45,6 +39,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME; /** *

@@ -54,7 +49,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_GRANT_NOTICE_BEAN_NAME) public class BizResourceFileGrantNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileGrantNoticeService { @Autowired private IBizResourceFileGrantNoticeFileService grantNoticeFileService; @@ -207,4 +202,9 @@ return ReturnUtil.success(resourceStaffInfoList); } + @Override + public void setBizName(BizResourceFileGrantNotice obj) { + obj.setBizName(obj.getFormName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java index be97ba7..84b4384 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileMethodConfirmMapper; @@ -30,7 +29,9 @@ import javax.servlet.http.HttpServletResponse; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_METHOD_CONFIRM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME; /** *

@@ -40,7 +41,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_CONFIRM_BEAN_NAME) public class BizResourceFileMethodConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodConfirmService { @Autowired @@ -83,4 +84,9 @@ printFileRegister.registerPrintFile(RESOURCE_FILE_METHOD_CONFIRM, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizResourceFileMethodConfirm obj) { + obj.setBizName(obj.getFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java index 99ff716..066a925 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java @@ -25,7 +25,6 @@ import com.casic.missiles.service.resource.IBizResourceFileMethodNoveltySearchService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME; + /** *

* 资源管理-文件管理-测试校准检定方法查新记录表 服务实现类 @@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME) public class BizResourceFileMethodNoveltySearchServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodNoveltySearchService { @Autowired private IBizResourceFileMethodNoveltySearchLogService noveltySearchLogService; @@ -152,6 +153,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileMethodNoveltySearch obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noveltyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("novelty_id", noveltyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java index 1546f0b..0b2b221 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java @@ -15,15 +15,12 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.system.FilePrintEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileRecallArchiveMapper; import com.casic.missiles.model.resource.BizResourceFileRecallArchive; import com.casic.missiles.model.resource.BizResourceFileRecallArchiveFile; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.service.flowable.ApprovalOperateService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveFileService; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveService; @@ -38,7 +35,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_RECALL_ARCHIVE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME; /** *

@@ -48,7 +47,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_RECALL_ARCHIVE_BEAN_NAME) public class BizResourceFileRecallArchiveServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileRecallArchiveService { @Autowired private IBizResourceFileRecallArchiveFileService recallArchiveFileService; @@ -160,6 +159,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileRecallArchive obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noticeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("archive_id", noticeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java index 1102ccd..1eeacfb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java @@ -1,9 +1,7 @@ package com.casic.missiles.service.Impl.resource; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -11,7 +9,6 @@ import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.resource.seal.SealLogListRequest; import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest; import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -19,14 +16,12 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSealUseNoteMapper; -import com.casic.missiles.model.resource.BizResourceSealUseLog; import com.casic.missiles.model.resource.BizResourceSealUseNote; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceSealUseNoteService; import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,7 +30,9 @@ import java.util.List; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SEAL_USE_NOTE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SEAL_USE_BEAN_NAME; /** *

@@ -45,7 +42,7 @@ * @author wangpeng * @since 2023-07-28 */ -@Service +@Service(SEAL_USE_BEAN_NAME) public class BizResourceSealUseNoteServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSealUseNoteService { @Autowired @@ -95,4 +92,8 @@ } } + @Override + public void setBizName(BizResourceSealUseNote obj) { + obj.setBizName(obj.getNoteFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java index 9ff1881..403f910 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java @@ -35,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME; + /** *

* 在用软件管理-软件评审报告 服务实现类 @@ -43,7 +45,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVIEW_REPORT_BEAN_NAME) public class BizResourceSoftwareReviewReportServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareReviewReportService { @Autowired private IBizResourceSoftwareReviewReportStaffService reviewReportStaffService; @@ -150,6 +152,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSoftwareReviewReport obj) { + obj.setBizName(obj.getReportName()); + } + private void removeRelationData(Long reportId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("report_id", reportId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java index 451a4fb..5b7b654 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java @@ -29,6 +29,8 @@ import javax.validation.Valid; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME; + /** *

* 在用软件管理-软件修订申请 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVISION_APPLY_BEAN_NAME) public class BizResourceSoftwareRevisionApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareRevisionApplyService { @Autowired @@ -80,5 +82,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.SOFTWARE_REVISION_REQUEST, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } - + @Override + public void setBizName(BizResourceSoftwareRevisionApply obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java index 878ce47..ec0db87 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java @@ -35,6 +35,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CONSUMABLE_GOODS_APPLY_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME; /** *

@@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-18 */ -@Service +@Service(CONSUMABLE_GOODS_APPLY_BEAN_NAME) public class BizResourceSupplierConsumableGoodsApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsApplyService { @Autowired private IBizResourceSupplierConsumableGoodsDetailService goodsDetailService; @@ -156,6 +157,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsApply obj) { + obj.setBizName(obj.getApplyName()); + } + private void removeRelationData(Long applyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id", applyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java index e12dc77..6fb275c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java @@ -18,7 +18,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierConsumableGoodsEvaluateMapper; @@ -39,7 +38,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_CONSUMABLE_GOODS_EVALUATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME; /** *

@@ -49,7 +50,7 @@ * @author wangpeng * @since 2023-09-21 */ -@Service +@Service(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME) public class BizResourceSupplierConsumableGoodsEvaluateServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsEvaluateService { @Autowired private IBizResourceSupplierConsumableGoodsEvaluateContentService goodsEvaluateContentService; @@ -169,6 +170,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsEvaluate obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long formId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("form_id", formId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java index f7cf0a5..d71c951 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java @@ -17,7 +17,6 @@ import com.casic.missiles.dto.resource.supplier.SupplierConsumableGoodsUseSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierConsumableGoodsUseMapper; @@ -38,7 +37,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_CONSUMABLE_GOODS_USE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME; /** *

@@ -48,7 +49,7 @@ * @author wangpeng * @since 2023-09-20 */ -@Service +@Service(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME) public class BizResourceSupplierConsumableGoodsUseServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsUseService { @Autowired private IBizResourceSupplierConsumableGoodsUseDetailService goodsUseDetailService; @@ -163,6 +164,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsUse obj) { + obj.setBizName(obj.getRecordName()); + } + private void removeRelationData(Long recordId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("record_id", recordId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java index f0f6d47..ba436a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java @@ -18,7 +18,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierEvaluateMapper; @@ -35,11 +34,13 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; -import java.util.stream.Collectors; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_EVALUATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME; /** *

@@ -49,7 +50,7 @@ * @author wangpeng * @since 2023-09-21 */ -@Service +@Service(SUPPLIER_EVALUATE_BEAN_NAME) public class BizResourceSupplierEvaluateServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierEvaluateService { @Autowired private IBizResourceSupplierEvaluateContentService evaluateContentService; @@ -180,6 +181,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierEvaluate obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long formId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("form_id", formId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java index 68d328b..b85f6f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.GOODS_ACCEPTANCE_APPLY_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-09-19 */ -@Service +@Service(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME) public class BizResourceSupplierGoodsAcceptanceRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierGoodsAcceptanceRecordService { @Autowired private PrintFileRegister printFileRegister; @@ -82,4 +83,9 @@ Map map = BeanUtil.beanToMap(acceptanceRecord); printFileRegister.registerPrintFile(GOODS_ACCEPTANCE_APPLY_FORM, "1", null, map, exportDTO.isPdf(), response); } + + @Override + public void setBizName(BizResourceSupplierGoodsAcceptanceRecord obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java index 1b876fb..61c8686 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java @@ -15,7 +15,6 @@ import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.model.resource.BizResourceFileApproval; import com.casic.missiles.model.resource.BizResourceFileApprovalFile; -import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceFileApprovalFileService; import com.casic.missiles.service.resource.IBizResourceFileApprovalService; @@ -26,6 +25,8 @@ import java.util.List; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_APPROVAL_BEAN_NAME; + /** *

* 资源管理-文件管理-文件审批(审批通过后的文件与体系/技术文件无关) 服务实现类 @@ -34,7 +35,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_APPROVAL_BEAN_NAME) public class BizResourceFileApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileApprovalService { @Autowired private SystemTemplateMapper templateMapper; @@ -121,4 +122,9 @@ // bizResourceFileApproval.setFileTemplateFile(systemTemplate.getMinioFileName()); return ReturnUtil.success(bizResourceFileApproval); } + + @Override + public void setBizName(BizResourceFileApproval obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index b8cedd8..9ffe522 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -36,6 +36,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_CHANGE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME; /** *

@@ -45,7 +46,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_CHANGE_FORM_BEAN_NAME) public class BizResourceFileChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileChangeService { @Autowired private IBizResourceFileChangeFileService changeFileService; @@ -160,6 +161,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileChange obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("change_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java index 800fe26..d408e06 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -17,17 +16,12 @@ import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.workbench.MessageSourceModuleEnum; -import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileGrantNoticeMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; import com.casic.missiles.model.resource.BizResourceFileGrantNoticeFile; import com.casic.missiles.model.resource.BizResourceStaffInfo; -import com.casic.missiles.model.resource.BizResourceStaffVerifier; -import com.casic.missiles.model.workbench.WorkbenchRemindMessage; -import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileGrantNoticeFileService; @@ -45,6 +39,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME; /** *

@@ -54,7 +49,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_GRANT_NOTICE_BEAN_NAME) public class BizResourceFileGrantNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileGrantNoticeService { @Autowired private IBizResourceFileGrantNoticeFileService grantNoticeFileService; @@ -207,4 +202,9 @@ return ReturnUtil.success(resourceStaffInfoList); } + @Override + public void setBizName(BizResourceFileGrantNotice obj) { + obj.setBizName(obj.getFormName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java index be97ba7..84b4384 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileMethodConfirmMapper; @@ -30,7 +29,9 @@ import javax.servlet.http.HttpServletResponse; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_METHOD_CONFIRM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME; /** *

@@ -40,7 +41,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_CONFIRM_BEAN_NAME) public class BizResourceFileMethodConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodConfirmService { @Autowired @@ -83,4 +84,9 @@ printFileRegister.registerPrintFile(RESOURCE_FILE_METHOD_CONFIRM, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizResourceFileMethodConfirm obj) { + obj.setBizName(obj.getFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java index 99ff716..066a925 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java @@ -25,7 +25,6 @@ import com.casic.missiles.service.resource.IBizResourceFileMethodNoveltySearchService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME; + /** *

* 资源管理-文件管理-测试校准检定方法查新记录表 服务实现类 @@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME) public class BizResourceFileMethodNoveltySearchServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodNoveltySearchService { @Autowired private IBizResourceFileMethodNoveltySearchLogService noveltySearchLogService; @@ -152,6 +153,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileMethodNoveltySearch obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noveltyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("novelty_id", noveltyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java index 1546f0b..0b2b221 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java @@ -15,15 +15,12 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.system.FilePrintEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileRecallArchiveMapper; import com.casic.missiles.model.resource.BizResourceFileRecallArchive; import com.casic.missiles.model.resource.BizResourceFileRecallArchiveFile; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.service.flowable.ApprovalOperateService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveFileService; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveService; @@ -38,7 +35,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_RECALL_ARCHIVE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME; /** *

@@ -48,7 +47,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_RECALL_ARCHIVE_BEAN_NAME) public class BizResourceFileRecallArchiveServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileRecallArchiveService { @Autowired private IBizResourceFileRecallArchiveFileService recallArchiveFileService; @@ -160,6 +159,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileRecallArchive obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noticeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("archive_id", noticeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java index 1102ccd..1eeacfb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java @@ -1,9 +1,7 @@ package com.casic.missiles.service.Impl.resource; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -11,7 +9,6 @@ import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.resource.seal.SealLogListRequest; import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest; import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -19,14 +16,12 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSealUseNoteMapper; -import com.casic.missiles.model.resource.BizResourceSealUseLog; import com.casic.missiles.model.resource.BizResourceSealUseNote; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceSealUseNoteService; import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,7 +30,9 @@ import java.util.List; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SEAL_USE_NOTE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SEAL_USE_BEAN_NAME; /** *

@@ -45,7 +42,7 @@ * @author wangpeng * @since 2023-07-28 */ -@Service +@Service(SEAL_USE_BEAN_NAME) public class BizResourceSealUseNoteServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSealUseNoteService { @Autowired @@ -95,4 +92,8 @@ } } + @Override + public void setBizName(BizResourceSealUseNote obj) { + obj.setBizName(obj.getNoteFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java index 9ff1881..403f910 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java @@ -35,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME; + /** *

* 在用软件管理-软件评审报告 服务实现类 @@ -43,7 +45,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVIEW_REPORT_BEAN_NAME) public class BizResourceSoftwareReviewReportServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareReviewReportService { @Autowired private IBizResourceSoftwareReviewReportStaffService reviewReportStaffService; @@ -150,6 +152,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSoftwareReviewReport obj) { + obj.setBizName(obj.getReportName()); + } + private void removeRelationData(Long reportId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("report_id", reportId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java index 451a4fb..5b7b654 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java @@ -29,6 +29,8 @@ import javax.validation.Valid; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME; + /** *

* 在用软件管理-软件修订申请 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVISION_APPLY_BEAN_NAME) public class BizResourceSoftwareRevisionApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareRevisionApplyService { @Autowired @@ -80,5 +82,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.SOFTWARE_REVISION_REQUEST, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } - + @Override + public void setBizName(BizResourceSoftwareRevisionApply obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java index 878ce47..ec0db87 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java @@ -35,6 +35,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CONSUMABLE_GOODS_APPLY_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME; /** *

@@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-18 */ -@Service +@Service(CONSUMABLE_GOODS_APPLY_BEAN_NAME) public class BizResourceSupplierConsumableGoodsApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsApplyService { @Autowired private IBizResourceSupplierConsumableGoodsDetailService goodsDetailService; @@ -156,6 +157,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsApply obj) { + obj.setBizName(obj.getApplyName()); + } + private void removeRelationData(Long applyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id", applyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java index e12dc77..6fb275c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java @@ -18,7 +18,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierConsumableGoodsEvaluateMapper; @@ -39,7 +38,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_CONSUMABLE_GOODS_EVALUATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME; /** *

@@ -49,7 +50,7 @@ * @author wangpeng * @since 2023-09-21 */ -@Service +@Service(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME) public class BizResourceSupplierConsumableGoodsEvaluateServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsEvaluateService { @Autowired private IBizResourceSupplierConsumableGoodsEvaluateContentService goodsEvaluateContentService; @@ -169,6 +170,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsEvaluate obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long formId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("form_id", formId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java index f7cf0a5..d71c951 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java @@ -17,7 +17,6 @@ import com.casic.missiles.dto.resource.supplier.SupplierConsumableGoodsUseSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierConsumableGoodsUseMapper; @@ -38,7 +37,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_CONSUMABLE_GOODS_USE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME; /** *

@@ -48,7 +49,7 @@ * @author wangpeng * @since 2023-09-20 */ -@Service +@Service(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME) public class BizResourceSupplierConsumableGoodsUseServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsUseService { @Autowired private IBizResourceSupplierConsumableGoodsUseDetailService goodsUseDetailService; @@ -163,6 +164,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsUse obj) { + obj.setBizName(obj.getRecordName()); + } + private void removeRelationData(Long recordId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("record_id", recordId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java index f0f6d47..ba436a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java @@ -18,7 +18,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierEvaluateMapper; @@ -35,11 +34,13 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; -import java.util.stream.Collectors; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_EVALUATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME; /** *

@@ -49,7 +50,7 @@ * @author wangpeng * @since 2023-09-21 */ -@Service +@Service(SUPPLIER_EVALUATE_BEAN_NAME) public class BizResourceSupplierEvaluateServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierEvaluateService { @Autowired private IBizResourceSupplierEvaluateContentService evaluateContentService; @@ -180,6 +181,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierEvaluate obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long formId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("form_id", formId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java index 68d328b..b85f6f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.GOODS_ACCEPTANCE_APPLY_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-09-19 */ -@Service +@Service(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME) public class BizResourceSupplierGoodsAcceptanceRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierGoodsAcceptanceRecordService { @Autowired private PrintFileRegister printFileRegister; @@ -82,4 +83,9 @@ Map map = BeanUtil.beanToMap(acceptanceRecord); printFileRegister.registerPrintFile(GOODS_ACCEPTANCE_APPLY_FORM, "1", null, map, exportDTO.isPdf(), response); } + + @Override + public void setBizName(BizResourceSupplierGoodsAcceptanceRecord obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java index d1759d3..c656fbf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java @@ -35,6 +35,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.GOODS_WAREHOUSE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME; /** *

@@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-19 */ -@Service +@Service(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME) public class BizResourceSupplierGoodsWarehouseServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierGoodsWarehouseService { @Autowired private IBizResourceSupplierGoodsWarehouseDetailService goodsWarehouseDetailService; @@ -165,6 +166,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierGoodsWarehouse obj) { + obj.setBizName(obj.getWarehouseName()); + } + private void removeRelationData(Long warehouseId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("warehouse_id", warehouseId); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java index 1b876fb..61c8686 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java @@ -15,7 +15,6 @@ import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.model.resource.BizResourceFileApproval; import com.casic.missiles.model.resource.BizResourceFileApprovalFile; -import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceFileApprovalFileService; import com.casic.missiles.service.resource.IBizResourceFileApprovalService; @@ -26,6 +25,8 @@ import java.util.List; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_APPROVAL_BEAN_NAME; + /** *

* 资源管理-文件管理-文件审批(审批通过后的文件与体系/技术文件无关) 服务实现类 @@ -34,7 +35,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_APPROVAL_BEAN_NAME) public class BizResourceFileApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileApprovalService { @Autowired private SystemTemplateMapper templateMapper; @@ -121,4 +122,9 @@ // bizResourceFileApproval.setFileTemplateFile(systemTemplate.getMinioFileName()); return ReturnUtil.success(bizResourceFileApproval); } + + @Override + public void setBizName(BizResourceFileApproval obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index b8cedd8..9ffe522 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -36,6 +36,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_CHANGE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME; /** *

@@ -45,7 +46,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_CHANGE_FORM_BEAN_NAME) public class BizResourceFileChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileChangeService { @Autowired private IBizResourceFileChangeFileService changeFileService; @@ -160,6 +161,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileChange obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("change_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java index 800fe26..d408e06 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -17,17 +16,12 @@ import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.workbench.MessageSourceModuleEnum; -import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileGrantNoticeMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; import com.casic.missiles.model.resource.BizResourceFileGrantNoticeFile; import com.casic.missiles.model.resource.BizResourceStaffInfo; -import com.casic.missiles.model.resource.BizResourceStaffVerifier; -import com.casic.missiles.model.workbench.WorkbenchRemindMessage; -import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileGrantNoticeFileService; @@ -45,6 +39,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME; /** *

@@ -54,7 +49,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_GRANT_NOTICE_BEAN_NAME) public class BizResourceFileGrantNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileGrantNoticeService { @Autowired private IBizResourceFileGrantNoticeFileService grantNoticeFileService; @@ -207,4 +202,9 @@ return ReturnUtil.success(resourceStaffInfoList); } + @Override + public void setBizName(BizResourceFileGrantNotice obj) { + obj.setBizName(obj.getFormName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java index be97ba7..84b4384 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileMethodConfirmMapper; @@ -30,7 +29,9 @@ import javax.servlet.http.HttpServletResponse; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_METHOD_CONFIRM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME; /** *

@@ -40,7 +41,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_CONFIRM_BEAN_NAME) public class BizResourceFileMethodConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodConfirmService { @Autowired @@ -83,4 +84,9 @@ printFileRegister.registerPrintFile(RESOURCE_FILE_METHOD_CONFIRM, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizResourceFileMethodConfirm obj) { + obj.setBizName(obj.getFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java index 99ff716..066a925 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java @@ -25,7 +25,6 @@ import com.casic.missiles.service.resource.IBizResourceFileMethodNoveltySearchService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME; + /** *

* 资源管理-文件管理-测试校准检定方法查新记录表 服务实现类 @@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME) public class BizResourceFileMethodNoveltySearchServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodNoveltySearchService { @Autowired private IBizResourceFileMethodNoveltySearchLogService noveltySearchLogService; @@ -152,6 +153,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileMethodNoveltySearch obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noveltyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("novelty_id", noveltyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java index 1546f0b..0b2b221 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java @@ -15,15 +15,12 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.system.FilePrintEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileRecallArchiveMapper; import com.casic.missiles.model.resource.BizResourceFileRecallArchive; import com.casic.missiles.model.resource.BizResourceFileRecallArchiveFile; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.service.flowable.ApprovalOperateService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveFileService; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveService; @@ -38,7 +35,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_RECALL_ARCHIVE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME; /** *

@@ -48,7 +47,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_RECALL_ARCHIVE_BEAN_NAME) public class BizResourceFileRecallArchiveServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileRecallArchiveService { @Autowired private IBizResourceFileRecallArchiveFileService recallArchiveFileService; @@ -160,6 +159,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileRecallArchive obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noticeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("archive_id", noticeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java index 1102ccd..1eeacfb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java @@ -1,9 +1,7 @@ package com.casic.missiles.service.Impl.resource; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -11,7 +9,6 @@ import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.resource.seal.SealLogListRequest; import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest; import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -19,14 +16,12 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSealUseNoteMapper; -import com.casic.missiles.model.resource.BizResourceSealUseLog; import com.casic.missiles.model.resource.BizResourceSealUseNote; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceSealUseNoteService; import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,7 +30,9 @@ import java.util.List; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SEAL_USE_NOTE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SEAL_USE_BEAN_NAME; /** *

@@ -45,7 +42,7 @@ * @author wangpeng * @since 2023-07-28 */ -@Service +@Service(SEAL_USE_BEAN_NAME) public class BizResourceSealUseNoteServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSealUseNoteService { @Autowired @@ -95,4 +92,8 @@ } } + @Override + public void setBizName(BizResourceSealUseNote obj) { + obj.setBizName(obj.getNoteFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java index 9ff1881..403f910 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java @@ -35,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME; + /** *

* 在用软件管理-软件评审报告 服务实现类 @@ -43,7 +45,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVIEW_REPORT_BEAN_NAME) public class BizResourceSoftwareReviewReportServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareReviewReportService { @Autowired private IBizResourceSoftwareReviewReportStaffService reviewReportStaffService; @@ -150,6 +152,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSoftwareReviewReport obj) { + obj.setBizName(obj.getReportName()); + } + private void removeRelationData(Long reportId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("report_id", reportId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java index 451a4fb..5b7b654 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java @@ -29,6 +29,8 @@ import javax.validation.Valid; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME; + /** *

* 在用软件管理-软件修订申请 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVISION_APPLY_BEAN_NAME) public class BizResourceSoftwareRevisionApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareRevisionApplyService { @Autowired @@ -80,5 +82,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.SOFTWARE_REVISION_REQUEST, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } - + @Override + public void setBizName(BizResourceSoftwareRevisionApply obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java index 878ce47..ec0db87 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java @@ -35,6 +35,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CONSUMABLE_GOODS_APPLY_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME; /** *

@@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-18 */ -@Service +@Service(CONSUMABLE_GOODS_APPLY_BEAN_NAME) public class BizResourceSupplierConsumableGoodsApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsApplyService { @Autowired private IBizResourceSupplierConsumableGoodsDetailService goodsDetailService; @@ -156,6 +157,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsApply obj) { + obj.setBizName(obj.getApplyName()); + } + private void removeRelationData(Long applyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id", applyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java index e12dc77..6fb275c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java @@ -18,7 +18,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierConsumableGoodsEvaluateMapper; @@ -39,7 +38,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_CONSUMABLE_GOODS_EVALUATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME; /** *

@@ -49,7 +50,7 @@ * @author wangpeng * @since 2023-09-21 */ -@Service +@Service(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME) public class BizResourceSupplierConsumableGoodsEvaluateServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsEvaluateService { @Autowired private IBizResourceSupplierConsumableGoodsEvaluateContentService goodsEvaluateContentService; @@ -169,6 +170,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsEvaluate obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long formId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("form_id", formId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java index f7cf0a5..d71c951 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java @@ -17,7 +17,6 @@ import com.casic.missiles.dto.resource.supplier.SupplierConsumableGoodsUseSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierConsumableGoodsUseMapper; @@ -38,7 +37,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_CONSUMABLE_GOODS_USE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME; /** *

@@ -48,7 +49,7 @@ * @author wangpeng * @since 2023-09-20 */ -@Service +@Service(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME) public class BizResourceSupplierConsumableGoodsUseServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsUseService { @Autowired private IBizResourceSupplierConsumableGoodsUseDetailService goodsUseDetailService; @@ -163,6 +164,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsUse obj) { + obj.setBizName(obj.getRecordName()); + } + private void removeRelationData(Long recordId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("record_id", recordId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java index f0f6d47..ba436a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java @@ -18,7 +18,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierEvaluateMapper; @@ -35,11 +34,13 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; -import java.util.stream.Collectors; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_EVALUATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME; /** *

@@ -49,7 +50,7 @@ * @author wangpeng * @since 2023-09-21 */ -@Service +@Service(SUPPLIER_EVALUATE_BEAN_NAME) public class BizResourceSupplierEvaluateServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierEvaluateService { @Autowired private IBizResourceSupplierEvaluateContentService evaluateContentService; @@ -180,6 +181,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierEvaluate obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long formId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("form_id", formId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java index 68d328b..b85f6f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.GOODS_ACCEPTANCE_APPLY_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-09-19 */ -@Service +@Service(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME) public class BizResourceSupplierGoodsAcceptanceRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierGoodsAcceptanceRecordService { @Autowired private PrintFileRegister printFileRegister; @@ -82,4 +83,9 @@ Map map = BeanUtil.beanToMap(acceptanceRecord); printFileRegister.registerPrintFile(GOODS_ACCEPTANCE_APPLY_FORM, "1", null, map, exportDTO.isPdf(), response); } + + @Override + public void setBizName(BizResourceSupplierGoodsAcceptanceRecord obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java index d1759d3..c656fbf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java @@ -35,6 +35,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.GOODS_WAREHOUSE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME; /** *

@@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-19 */ -@Service +@Service(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME) public class BizResourceSupplierGoodsWarehouseServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierGoodsWarehouseService { @Autowired private IBizResourceSupplierGoodsWarehouseDetailService goodsWarehouseDetailService; @@ -165,6 +166,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierGoodsWarehouse obj) { + obj.setBizName(obj.getWarehouseName()); + } + private void removeRelationData(Long warehouseId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("warehouse_id", warehouseId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierInfoServiceImpl.java index 5a7bf27..b448cb8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierInfoServiceImpl.java @@ -35,6 +35,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.SUPPLIER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_BEAN_NAME; /** *

@@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(SUPPLIER_BEAN_NAME) public class BizResourceSupplierInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierInfoService { @Autowired private IBizResourceSupplierPersonService supplierPersonService; @@ -182,4 +183,9 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizResourceSupplierInfo obj) { + obj.setBizName(obj.getSupplierName()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java index 1b876fb..61c8686 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java @@ -15,7 +15,6 @@ import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.model.resource.BizResourceFileApproval; import com.casic.missiles.model.resource.BizResourceFileApprovalFile; -import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceFileApprovalFileService; import com.casic.missiles.service.resource.IBizResourceFileApprovalService; @@ -26,6 +25,8 @@ import java.util.List; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_APPROVAL_BEAN_NAME; + /** *

* 资源管理-文件管理-文件审批(审批通过后的文件与体系/技术文件无关) 服务实现类 @@ -34,7 +35,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_APPROVAL_BEAN_NAME) public class BizResourceFileApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileApprovalService { @Autowired private SystemTemplateMapper templateMapper; @@ -121,4 +122,9 @@ // bizResourceFileApproval.setFileTemplateFile(systemTemplate.getMinioFileName()); return ReturnUtil.success(bizResourceFileApproval); } + + @Override + public void setBizName(BizResourceFileApproval obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index b8cedd8..9ffe522 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -36,6 +36,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_CHANGE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME; /** *

@@ -45,7 +46,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_CHANGE_FORM_BEAN_NAME) public class BizResourceFileChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileChangeService { @Autowired private IBizResourceFileChangeFileService changeFileService; @@ -160,6 +161,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileChange obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("change_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java index 800fe26..d408e06 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -17,17 +16,12 @@ import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.workbench.MessageSourceModuleEnum; -import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileGrantNoticeMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; import com.casic.missiles.model.resource.BizResourceFileGrantNoticeFile; import com.casic.missiles.model.resource.BizResourceStaffInfo; -import com.casic.missiles.model.resource.BizResourceStaffVerifier; -import com.casic.missiles.model.workbench.WorkbenchRemindMessage; -import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileGrantNoticeFileService; @@ -45,6 +39,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME; /** *

@@ -54,7 +49,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_GRANT_NOTICE_BEAN_NAME) public class BizResourceFileGrantNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileGrantNoticeService { @Autowired private IBizResourceFileGrantNoticeFileService grantNoticeFileService; @@ -207,4 +202,9 @@ return ReturnUtil.success(resourceStaffInfoList); } + @Override + public void setBizName(BizResourceFileGrantNotice obj) { + obj.setBizName(obj.getFormName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java index be97ba7..84b4384 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileMethodConfirmMapper; @@ -30,7 +29,9 @@ import javax.servlet.http.HttpServletResponse; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_METHOD_CONFIRM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME; /** *

@@ -40,7 +41,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_CONFIRM_BEAN_NAME) public class BizResourceFileMethodConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodConfirmService { @Autowired @@ -83,4 +84,9 @@ printFileRegister.registerPrintFile(RESOURCE_FILE_METHOD_CONFIRM, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizResourceFileMethodConfirm obj) { + obj.setBizName(obj.getFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java index 99ff716..066a925 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java @@ -25,7 +25,6 @@ import com.casic.missiles.service.resource.IBizResourceFileMethodNoveltySearchService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME; + /** *

* 资源管理-文件管理-测试校准检定方法查新记录表 服务实现类 @@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME) public class BizResourceFileMethodNoveltySearchServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodNoveltySearchService { @Autowired private IBizResourceFileMethodNoveltySearchLogService noveltySearchLogService; @@ -152,6 +153,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileMethodNoveltySearch obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noveltyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("novelty_id", noveltyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java index 1546f0b..0b2b221 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java @@ -15,15 +15,12 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.system.FilePrintEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileRecallArchiveMapper; import com.casic.missiles.model.resource.BizResourceFileRecallArchive; import com.casic.missiles.model.resource.BizResourceFileRecallArchiveFile; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.service.flowable.ApprovalOperateService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveFileService; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveService; @@ -38,7 +35,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_RECALL_ARCHIVE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME; /** *

@@ -48,7 +47,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_RECALL_ARCHIVE_BEAN_NAME) public class BizResourceFileRecallArchiveServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileRecallArchiveService { @Autowired private IBizResourceFileRecallArchiveFileService recallArchiveFileService; @@ -160,6 +159,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileRecallArchive obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noticeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("archive_id", noticeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java index 1102ccd..1eeacfb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java @@ -1,9 +1,7 @@ package com.casic.missiles.service.Impl.resource; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -11,7 +9,6 @@ import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.resource.seal.SealLogListRequest; import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest; import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -19,14 +16,12 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSealUseNoteMapper; -import com.casic.missiles.model.resource.BizResourceSealUseLog; import com.casic.missiles.model.resource.BizResourceSealUseNote; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceSealUseNoteService; import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,7 +30,9 @@ import java.util.List; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SEAL_USE_NOTE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SEAL_USE_BEAN_NAME; /** *

@@ -45,7 +42,7 @@ * @author wangpeng * @since 2023-07-28 */ -@Service +@Service(SEAL_USE_BEAN_NAME) public class BizResourceSealUseNoteServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSealUseNoteService { @Autowired @@ -95,4 +92,8 @@ } } + @Override + public void setBizName(BizResourceSealUseNote obj) { + obj.setBizName(obj.getNoteFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java index 9ff1881..403f910 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java @@ -35,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME; + /** *

* 在用软件管理-软件评审报告 服务实现类 @@ -43,7 +45,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVIEW_REPORT_BEAN_NAME) public class BizResourceSoftwareReviewReportServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareReviewReportService { @Autowired private IBizResourceSoftwareReviewReportStaffService reviewReportStaffService; @@ -150,6 +152,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSoftwareReviewReport obj) { + obj.setBizName(obj.getReportName()); + } + private void removeRelationData(Long reportId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("report_id", reportId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java index 451a4fb..5b7b654 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java @@ -29,6 +29,8 @@ import javax.validation.Valid; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME; + /** *

* 在用软件管理-软件修订申请 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVISION_APPLY_BEAN_NAME) public class BizResourceSoftwareRevisionApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareRevisionApplyService { @Autowired @@ -80,5 +82,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.SOFTWARE_REVISION_REQUEST, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } - + @Override + public void setBizName(BizResourceSoftwareRevisionApply obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java index 878ce47..ec0db87 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java @@ -35,6 +35,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CONSUMABLE_GOODS_APPLY_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME; /** *

@@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-18 */ -@Service +@Service(CONSUMABLE_GOODS_APPLY_BEAN_NAME) public class BizResourceSupplierConsumableGoodsApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsApplyService { @Autowired private IBizResourceSupplierConsumableGoodsDetailService goodsDetailService; @@ -156,6 +157,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsApply obj) { + obj.setBizName(obj.getApplyName()); + } + private void removeRelationData(Long applyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id", applyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java index e12dc77..6fb275c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java @@ -18,7 +18,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierConsumableGoodsEvaluateMapper; @@ -39,7 +38,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_CONSUMABLE_GOODS_EVALUATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME; /** *

@@ -49,7 +50,7 @@ * @author wangpeng * @since 2023-09-21 */ -@Service +@Service(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME) public class BizResourceSupplierConsumableGoodsEvaluateServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsEvaluateService { @Autowired private IBizResourceSupplierConsumableGoodsEvaluateContentService goodsEvaluateContentService; @@ -169,6 +170,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsEvaluate obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long formId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("form_id", formId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java index f7cf0a5..d71c951 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java @@ -17,7 +17,6 @@ import com.casic.missiles.dto.resource.supplier.SupplierConsumableGoodsUseSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierConsumableGoodsUseMapper; @@ -38,7 +37,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_CONSUMABLE_GOODS_USE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME; /** *

@@ -48,7 +49,7 @@ * @author wangpeng * @since 2023-09-20 */ -@Service +@Service(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME) public class BizResourceSupplierConsumableGoodsUseServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsUseService { @Autowired private IBizResourceSupplierConsumableGoodsUseDetailService goodsUseDetailService; @@ -163,6 +164,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsUse obj) { + obj.setBizName(obj.getRecordName()); + } + private void removeRelationData(Long recordId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("record_id", recordId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java index f0f6d47..ba436a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java @@ -18,7 +18,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierEvaluateMapper; @@ -35,11 +34,13 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; -import java.util.stream.Collectors; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_EVALUATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME; /** *

@@ -49,7 +50,7 @@ * @author wangpeng * @since 2023-09-21 */ -@Service +@Service(SUPPLIER_EVALUATE_BEAN_NAME) public class BizResourceSupplierEvaluateServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierEvaluateService { @Autowired private IBizResourceSupplierEvaluateContentService evaluateContentService; @@ -180,6 +181,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierEvaluate obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long formId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("form_id", formId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java index 68d328b..b85f6f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.GOODS_ACCEPTANCE_APPLY_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-09-19 */ -@Service +@Service(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME) public class BizResourceSupplierGoodsAcceptanceRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierGoodsAcceptanceRecordService { @Autowired private PrintFileRegister printFileRegister; @@ -82,4 +83,9 @@ Map map = BeanUtil.beanToMap(acceptanceRecord); printFileRegister.registerPrintFile(GOODS_ACCEPTANCE_APPLY_FORM, "1", null, map, exportDTO.isPdf(), response); } + + @Override + public void setBizName(BizResourceSupplierGoodsAcceptanceRecord obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java index d1759d3..c656fbf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java @@ -35,6 +35,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.GOODS_WAREHOUSE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME; /** *

@@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-19 */ -@Service +@Service(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME) public class BizResourceSupplierGoodsWarehouseServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierGoodsWarehouseService { @Autowired private IBizResourceSupplierGoodsWarehouseDetailService goodsWarehouseDetailService; @@ -165,6 +166,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierGoodsWarehouse obj) { + obj.setBizName(obj.getWarehouseName()); + } + private void removeRelationData(Long warehouseId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("warehouse_id", warehouseId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierInfoServiceImpl.java index 5a7bf27..b448cb8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierInfoServiceImpl.java @@ -35,6 +35,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.SUPPLIER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_BEAN_NAME; /** *

@@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(SUPPLIER_BEAN_NAME) public class BizResourceSupplierInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierInfoService { @Autowired private IBizResourceSupplierPersonService supplierPersonService; @@ -182,4 +183,9 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizResourceSupplierInfo obj) { + obj.setBizName(obj.getSupplierName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierServiceEvaluateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierServiceEvaluateServiceImpl.java index ba36830..c0c4a60 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierServiceEvaluateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierServiceEvaluateServiceImpl.java @@ -28,17 +28,19 @@ import com.casic.missiles.service.resource.IBizResourceSupplierServiceEvaluateService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_SERVICE_EVALUATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME; /** *

@@ -48,7 +50,7 @@ * @author wangpeng * @since 2023-09-20 */ -@Service +@Service(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME) public class BizResourceSupplierServiceEvaluateServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierServiceEvaluateService { @Autowired private IBizResourceSupplierServiceEvaluateContentService evaluateContentService; @@ -168,6 +170,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierServiceEvaluate obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long formId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("form_id", formId); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java index 1b876fb..61c8686 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java @@ -15,7 +15,6 @@ import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.model.resource.BizResourceFileApproval; import com.casic.missiles.model.resource.BizResourceFileApprovalFile; -import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceFileApprovalFileService; import com.casic.missiles.service.resource.IBizResourceFileApprovalService; @@ -26,6 +25,8 @@ import java.util.List; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_APPROVAL_BEAN_NAME; + /** *

* 资源管理-文件管理-文件审批(审批通过后的文件与体系/技术文件无关) 服务实现类 @@ -34,7 +35,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_APPROVAL_BEAN_NAME) public class BizResourceFileApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileApprovalService { @Autowired private SystemTemplateMapper templateMapper; @@ -121,4 +122,9 @@ // bizResourceFileApproval.setFileTemplateFile(systemTemplate.getMinioFileName()); return ReturnUtil.success(bizResourceFileApproval); } + + @Override + public void setBizName(BizResourceFileApproval obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index b8cedd8..9ffe522 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -36,6 +36,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_CHANGE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME; /** *

@@ -45,7 +46,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_CHANGE_FORM_BEAN_NAME) public class BizResourceFileChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileChangeService { @Autowired private IBizResourceFileChangeFileService changeFileService; @@ -160,6 +161,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileChange obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("change_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java index 800fe26..d408e06 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -17,17 +16,12 @@ import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.workbench.MessageSourceModuleEnum; -import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileGrantNoticeMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; import com.casic.missiles.model.resource.BizResourceFileGrantNoticeFile; import com.casic.missiles.model.resource.BizResourceStaffInfo; -import com.casic.missiles.model.resource.BizResourceStaffVerifier; -import com.casic.missiles.model.workbench.WorkbenchRemindMessage; -import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileGrantNoticeFileService; @@ -45,6 +39,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME; /** *

@@ -54,7 +49,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_GRANT_NOTICE_BEAN_NAME) public class BizResourceFileGrantNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileGrantNoticeService { @Autowired private IBizResourceFileGrantNoticeFileService grantNoticeFileService; @@ -207,4 +202,9 @@ return ReturnUtil.success(resourceStaffInfoList); } + @Override + public void setBizName(BizResourceFileGrantNotice obj) { + obj.setBizName(obj.getFormName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java index be97ba7..84b4384 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileMethodConfirmMapper; @@ -30,7 +29,9 @@ import javax.servlet.http.HttpServletResponse; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_METHOD_CONFIRM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME; /** *

@@ -40,7 +41,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_CONFIRM_BEAN_NAME) public class BizResourceFileMethodConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodConfirmService { @Autowired @@ -83,4 +84,9 @@ printFileRegister.registerPrintFile(RESOURCE_FILE_METHOD_CONFIRM, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizResourceFileMethodConfirm obj) { + obj.setBizName(obj.getFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java index 99ff716..066a925 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java @@ -25,7 +25,6 @@ import com.casic.missiles.service.resource.IBizResourceFileMethodNoveltySearchService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME; + /** *

* 资源管理-文件管理-测试校准检定方法查新记录表 服务实现类 @@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME) public class BizResourceFileMethodNoveltySearchServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodNoveltySearchService { @Autowired private IBizResourceFileMethodNoveltySearchLogService noveltySearchLogService; @@ -152,6 +153,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileMethodNoveltySearch obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noveltyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("novelty_id", noveltyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java index 1546f0b..0b2b221 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java @@ -15,15 +15,12 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.system.FilePrintEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileRecallArchiveMapper; import com.casic.missiles.model.resource.BizResourceFileRecallArchive; import com.casic.missiles.model.resource.BizResourceFileRecallArchiveFile; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.service.flowable.ApprovalOperateService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveFileService; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveService; @@ -38,7 +35,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_RECALL_ARCHIVE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME; /** *

@@ -48,7 +47,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_RECALL_ARCHIVE_BEAN_NAME) public class BizResourceFileRecallArchiveServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileRecallArchiveService { @Autowired private IBizResourceFileRecallArchiveFileService recallArchiveFileService; @@ -160,6 +159,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileRecallArchive obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noticeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("archive_id", noticeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java index 1102ccd..1eeacfb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java @@ -1,9 +1,7 @@ package com.casic.missiles.service.Impl.resource; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -11,7 +9,6 @@ import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.resource.seal.SealLogListRequest; import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest; import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -19,14 +16,12 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSealUseNoteMapper; -import com.casic.missiles.model.resource.BizResourceSealUseLog; import com.casic.missiles.model.resource.BizResourceSealUseNote; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceSealUseNoteService; import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,7 +30,9 @@ import java.util.List; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SEAL_USE_NOTE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SEAL_USE_BEAN_NAME; /** *

@@ -45,7 +42,7 @@ * @author wangpeng * @since 2023-07-28 */ -@Service +@Service(SEAL_USE_BEAN_NAME) public class BizResourceSealUseNoteServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSealUseNoteService { @Autowired @@ -95,4 +92,8 @@ } } + @Override + public void setBizName(BizResourceSealUseNote obj) { + obj.setBizName(obj.getNoteFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java index 9ff1881..403f910 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java @@ -35,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME; + /** *

* 在用软件管理-软件评审报告 服务实现类 @@ -43,7 +45,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVIEW_REPORT_BEAN_NAME) public class BizResourceSoftwareReviewReportServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareReviewReportService { @Autowired private IBizResourceSoftwareReviewReportStaffService reviewReportStaffService; @@ -150,6 +152,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSoftwareReviewReport obj) { + obj.setBizName(obj.getReportName()); + } + private void removeRelationData(Long reportId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("report_id", reportId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java index 451a4fb..5b7b654 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java @@ -29,6 +29,8 @@ import javax.validation.Valid; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME; + /** *

* 在用软件管理-软件修订申请 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVISION_APPLY_BEAN_NAME) public class BizResourceSoftwareRevisionApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareRevisionApplyService { @Autowired @@ -80,5 +82,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.SOFTWARE_REVISION_REQUEST, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } - + @Override + public void setBizName(BizResourceSoftwareRevisionApply obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java index 878ce47..ec0db87 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java @@ -35,6 +35,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CONSUMABLE_GOODS_APPLY_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME; /** *

@@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-18 */ -@Service +@Service(CONSUMABLE_GOODS_APPLY_BEAN_NAME) public class BizResourceSupplierConsumableGoodsApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsApplyService { @Autowired private IBizResourceSupplierConsumableGoodsDetailService goodsDetailService; @@ -156,6 +157,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsApply obj) { + obj.setBizName(obj.getApplyName()); + } + private void removeRelationData(Long applyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id", applyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java index e12dc77..6fb275c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java @@ -18,7 +18,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierConsumableGoodsEvaluateMapper; @@ -39,7 +38,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_CONSUMABLE_GOODS_EVALUATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME; /** *

@@ -49,7 +50,7 @@ * @author wangpeng * @since 2023-09-21 */ -@Service +@Service(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME) public class BizResourceSupplierConsumableGoodsEvaluateServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsEvaluateService { @Autowired private IBizResourceSupplierConsumableGoodsEvaluateContentService goodsEvaluateContentService; @@ -169,6 +170,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsEvaluate obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long formId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("form_id", formId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java index f7cf0a5..d71c951 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java @@ -17,7 +17,6 @@ import com.casic.missiles.dto.resource.supplier.SupplierConsumableGoodsUseSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierConsumableGoodsUseMapper; @@ -38,7 +37,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_CONSUMABLE_GOODS_USE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME; /** *

@@ -48,7 +49,7 @@ * @author wangpeng * @since 2023-09-20 */ -@Service +@Service(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME) public class BizResourceSupplierConsumableGoodsUseServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsUseService { @Autowired private IBizResourceSupplierConsumableGoodsUseDetailService goodsUseDetailService; @@ -163,6 +164,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsUse obj) { + obj.setBizName(obj.getRecordName()); + } + private void removeRelationData(Long recordId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("record_id", recordId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java index f0f6d47..ba436a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java @@ -18,7 +18,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierEvaluateMapper; @@ -35,11 +34,13 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; -import java.util.stream.Collectors; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_EVALUATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME; /** *

@@ -49,7 +50,7 @@ * @author wangpeng * @since 2023-09-21 */ -@Service +@Service(SUPPLIER_EVALUATE_BEAN_NAME) public class BizResourceSupplierEvaluateServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierEvaluateService { @Autowired private IBizResourceSupplierEvaluateContentService evaluateContentService; @@ -180,6 +181,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierEvaluate obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long formId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("form_id", formId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java index 68d328b..b85f6f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.GOODS_ACCEPTANCE_APPLY_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-09-19 */ -@Service +@Service(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME) public class BizResourceSupplierGoodsAcceptanceRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierGoodsAcceptanceRecordService { @Autowired private PrintFileRegister printFileRegister; @@ -82,4 +83,9 @@ Map map = BeanUtil.beanToMap(acceptanceRecord); printFileRegister.registerPrintFile(GOODS_ACCEPTANCE_APPLY_FORM, "1", null, map, exportDTO.isPdf(), response); } + + @Override + public void setBizName(BizResourceSupplierGoodsAcceptanceRecord obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java index d1759d3..c656fbf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java @@ -35,6 +35,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.GOODS_WAREHOUSE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME; /** *

@@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-19 */ -@Service +@Service(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME) public class BizResourceSupplierGoodsWarehouseServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierGoodsWarehouseService { @Autowired private IBizResourceSupplierGoodsWarehouseDetailService goodsWarehouseDetailService; @@ -165,6 +166,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierGoodsWarehouse obj) { + obj.setBizName(obj.getWarehouseName()); + } + private void removeRelationData(Long warehouseId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("warehouse_id", warehouseId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierInfoServiceImpl.java index 5a7bf27..b448cb8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierInfoServiceImpl.java @@ -35,6 +35,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.SUPPLIER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_BEAN_NAME; /** *

@@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(SUPPLIER_BEAN_NAME) public class BizResourceSupplierInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierInfoService { @Autowired private IBizResourceSupplierPersonService supplierPersonService; @@ -182,4 +183,9 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizResourceSupplierInfo obj) { + obj.setBizName(obj.getSupplierName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierServiceEvaluateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierServiceEvaluateServiceImpl.java index ba36830..c0c4a60 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierServiceEvaluateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierServiceEvaluateServiceImpl.java @@ -28,17 +28,19 @@ import com.casic.missiles.service.resource.IBizResourceSupplierServiceEvaluateService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_SERVICE_EVALUATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME; /** *

@@ -48,7 +50,7 @@ * @author wangpeng * @since 2023-09-20 */ -@Service +@Service(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME) public class BizResourceSupplierServiceEvaluateServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierServiceEvaluateService { @Autowired private IBizResourceSupplierServiceEvaluateContentService evaluateContentService; @@ -168,6 +170,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierServiceEvaluate obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long formId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("form_id", formId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/BizWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/BizWorkbenchServiceImpl.java index c173fbe..6fc74f5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/BizWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/BizWorkbenchServiceImpl.java @@ -4,27 +4,41 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.GeneralApprovalDTO; import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.BaseApprovalListRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.EquipmentApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardApprovalListRequest; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.notifyevent.AwareActionStatusEnum; +import com.casic.missiles.enums.system.ApplyFromIdEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; +import com.casic.missiles.model.equipment.BizEquipmentStandardInfo; import com.casic.missiles.model.quality.BizLabRelDept; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.modular.system.dao.DictMapper; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; +import com.casic.missiles.service.Impl.equipment.BizEquipmentInfoServiceImpl; +import com.casic.missiles.service.Impl.equipment.BizEquipmentStandardInfoServiceImpl; import com.casic.missiles.service.business.IBizBusinessDeviceMeasureApprovalService; import com.casic.missiles.service.equipment.IBizEquipmentInfoService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckRecordApprovalService; import com.casic.missiles.service.quality.IBizLabRelDeptService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.SpringContextUtil; import com.casic.missiles.utils.SysDeptAndUserUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -41,6 +55,8 @@ import java.util.*; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.AwareActionStatusEnum.ACTION_STATUS_MAP; + /** * @Description: * @Author: wangpeng @@ -59,6 +75,8 @@ private IBizBusinessDeviceMeasureApprovalService measureApprovalService; @Autowired private IBizEquipmentStandardCheckRecordApprovalService checkRecordApprovalService; + @Autowired + private WorkbenchApprovalMessageMapper approvalMessageMapper; @Override public BizWorkbenchEquipmentAmount equipmentAmount(WorkbenchCommonRequest request) { @@ -242,6 +260,226 @@ return resultList; } + @Override + public List toBeApprovedListPage(ApprovalMessageRequest request) throws Exception { + return workbenchApprovalMessageList(request, 1); + } + + @Override + public List approvedListPage(ApprovalMessageRequest request) throws Exception { + return workbenchApprovalMessageList(request, 2); + } + + @NotNull + private List workbenchApprovalMessageList(ApprovalMessageRequest request, int approvalType) throws Exception { + AuthUser user = ShiroKit.getUser(); + Assert.isFalse(Objects.isNull(user), () -> { + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); + }); + List resultList = new ArrayList<>(); + Map actionStatusMap = ACTION_STATUS_MAP.getActionStatusMap(); + //待审批通知 + Arrays.stream(ApplyFromIdEnum.values()).forEach(applyFromIdEnum -> { + if (StringUtils.isNotEmpty(request.getSourceModule()) && !applyFromIdEnum.getSerialNumber().equals(request.getSourceModule())) { + return; + } + String beanName = actionStatusMap.get(applyFromIdEnum.getCode()).getBizBeanName(); + //设备台账与标准装置区分新建、编辑、删除审批，单独处理 + if(ApplyFromIdEnum.EQUIPMENT_APPROVAL.getCode().equals(applyFromIdEnum.getCode())){ + //设备台账 + if (1 == approvalType) { + convertForEquipment(resultList, applyFromIdEnum, 1); + } else { + convertForEquipment(resultList, applyFromIdEnum, 2); + } + } else if(ApplyFromIdEnum.STANDARD_APPROVAL.getCode().equals(applyFromIdEnum.getCode())){ + //标准装置 + if (1 == approvalType) { + convertForStandard(resultList, applyFromIdEnum, 1); + } else { + convertForStandard(resultList, applyFromIdEnum, 2); + } + } else if (ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode().equals(applyFromIdEnum.getCode())) { + // TODO: 2024/5/16 + if (1 == approvalType) { + + } else { + + } + } else { + if (1 == approvalType) { + convertTobeApproved(SpringContextUtil.getBean(beanName), applyFromIdEnum, resultList); + } else { + convertApproved(SpringContextUtil.getBean(beanName), applyFromIdEnum, resultList); + } + } + }); + //审批结果通知 + if (1 == approvalType) { + handleApprovalResultMessage(request, user, 0, resultList); + } else { + handleApprovalResultMessage(request, user, 1, resultList); + } + //按时间排序组装 + List finalList = resultList.stream().sorted(Comparator.comparing(WorkbenchApprovalMessage::getCreateTime).reversed()).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(finalList)) { + for (WorkbenchApprovalMessage approvalMessage : finalList) { + DictCodeUtils.convertDictCodeToName(approvalMessage); + //丰富跳转参数 +// enrichSkipParams(approvalMessage); + } + } + return finalList; + } + + @Override + public ReturnDTO updateStatus(ApprovalMessageUpdateRequest updateRequest) { + WorkbenchApprovalMessage message = new WorkbenchApprovalMessage(); + message.setId(updateRequest.getId()); + message.setReadStatus(updateRequest.getStatus()); + if(approvalMessageMapper.updateById(message) > 0) return ReturnUtil.success(); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + private void convertForEquipment(List resultList, ApplyFromIdEnum applyFromIdEnum, int approvalType) { + BizEquipmentInfoServiceImpl equipmentInfoBean = SpringContextUtil.getBean("bizEquipmentInfoServiceImpl"); + EquipmentApprovalListRequest equipmentApprovalListRequest = new EquipmentApprovalListRequest(); + Page page = new Page<>(); + page.setCurrent(1); + page.setSearchCount(false); + page.setSize(Integer.MAX_VALUE); + Page bizEquipmentInfoPage = null; + Integer readStatus; + if (1 == approvalType) { + bizEquipmentInfoPage = equipmentInfoBean.handlerBeApproved(page, page, equipmentApprovalListRequest); + readStatus = 0; + } else { + bizEquipmentInfoPage = equipmentInfoBean.handlerApproved(page, page, equipmentApprovalListRequest); + readStatus = 1; + } + if (Objects.nonNull(bizEquipmentInfoPage) && !CollectionUtils.isEmpty(bizEquipmentInfoPage.getRecords())) { + bizEquipmentInfoPage.getRecords().forEach(info -> { + WorkbenchApprovalMessage message = new WorkbenchApprovalMessage(); + message.setCreateTime(info.getCreateTime()); + message.setFormId(applyFromIdEnum.getCode()); + message.setSourceModule(applyFromIdEnum.getSerialNumber()); + message.setMessageTitle("待审批通知"); + //1新增2编辑3删除 + String type = "新建"; + if (2 == info.getApprovalType()) { + type = "修改"; + } else if (3 == info.getApprovalType()) { + type = "删除"; + } + message.setMessageContent(info.getEquipmentName() + type + "待审批"); + message.setReadStatus(readStatus); + message.setBizId(String.valueOf(info.getId())); + message.setProcessId(info.getProcessId()); + message.setTaskId(info.getTaskId()); + message.setDecisionItem(info.getDecisionItem()); + resultList.add(message); + }); + } + } + + private void convertForStandard(List resultList, ApplyFromIdEnum applyFromIdEnum, int approvalType) { + BizEquipmentStandardInfoServiceImpl standardInfoBean = SpringContextUtil.getBean("bizEquipmentStandardInfoServiceImpl"); + StandardApprovalListRequest standardApprovalListRequest = new StandardApprovalListRequest(); + Page page = new Page<>(); + page.setCurrent(1); + page.setSearchCount(false); + page.setSize(Integer.MAX_VALUE); + Page bizStandardInfoPage = null; + Integer readStatus; + if (1 == approvalType) { + bizStandardInfoPage = standardInfoBean.handlerBeApproved(page, page, standardApprovalListRequest); + readStatus = 0; + } else { + bizStandardInfoPage = standardInfoBean.handlerApproved(page, page, standardApprovalListRequest); + readStatus = 1; + } + if (Objects.nonNull(bizStandardInfoPage) && !CollectionUtils.isEmpty(bizStandardInfoPage.getRecords())) { + bizStandardInfoPage.getRecords().forEach(info -> { + WorkbenchApprovalMessage message = new WorkbenchApprovalMessage(); + message.setCreateTime(info.getCreateTime()); + message.setFormId(applyFromIdEnum.getCode()); + message.setSourceModule(applyFromIdEnum.getSerialNumber()); + message.setMessageTitle("待审批通知"); + //1新增2编辑3删除 + String type = "新建"; + if (2 == info.getApprovalType()) { + type = "修改"; + } else if (3 == info.getApprovalType()) { + type = "删除"; + } + message.setMessageContent(info.getStandardName() + type + "待审批"); + message.setReadStatus(readStatus); + message.setBizId(String.valueOf(info.getId())); + message.setProcessId(info.getProcessId()); + message.setTaskId(info.getTaskId()); + message.setDecisionItem(info.getDecisionItem()); + resultList.add(message); + }); + } + } + + private void handleApprovalResultMessage(ApprovalMessageRequest request, AuthUser user, int readStatus, List resultList) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("notice_id", user.getId()); + wrapper.eq(StringUtils.isNotBlank(request.getSourceModule()), "source_module", request.getSourceModule()); + wrapper.eq("read_status", readStatus); + wrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]); + wrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]); + List list = approvalMessageMapper.selectList(wrapper); + if (!CollectionUtils.isEmpty(list)) { + resultList.addAll(list); + } + } + + private void convertTobeApproved(S service, ApplyFromIdEnum applyFromIdEnum, List resultList) { + List toBeApprovedList = service.handlerBeApproved(applyFromIdEnum.getCode()); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + toBeApprovedList.forEach(a -> { + WorkbenchApprovalMessage message = new WorkbenchApprovalMessage(); + message.setCreateTime(a.getCreateTime()); + message.setFormId(applyFromIdEnum.getCode()); + message.setSourceModule(applyFromIdEnum.getSerialNumber()); + message.setMessageTitle("待审批通知"); + message.setMessageContent(a.getBizName() + "新建待审批"); + message.setReadStatus(0); + message.setBizId(String.valueOf(a.getId())); + message.setProcessId(a.getProcessId()); + message.setTaskId(a.getTaskId()); + message.setDecisionItem(a.getDecisionItem()); + resultList.add(message); + }); + } + } + + private void convertApproved(S service, ApplyFromIdEnum applyFromIdEnum, List resultList) { + BaseApprovalListRequest approvalListRequest = new BaseApprovalListRequest(); + approvalListRequest.setFormId(applyFromIdEnum.getCode()); + List approvedList = service.handlerApprovedList(applyFromIdEnum.getCode()); + if (!CollectionUtils.isEmpty(approvedList)) { + approvedList.forEach(a -> { + WorkbenchApprovalMessage message = new WorkbenchApprovalMessage(); + message.setCreateTime(a.getCreateTime()); + message.setFormId(applyFromIdEnum.getCode()); + message.setSourceModule(applyFromIdEnum.getSerialNumber()); + message.setMessageTitle("待审批通知"); + message.setMessageContent(a.getBizName() + "新建待审批"); + message.setReadStatus(1); + message.setBizId(String.valueOf(a.getId())); + message.setProcessId(a.getProcessId()); + message.setTaskId(a.getTaskId()); + message.setDecisionItem(a.getDecisionItem()); + resultList.add(message); + }); + } + } + @Nullable private Long handleStaffTypeRequest(WorkbenchCommonRequest request) { AuthUser user = ShiroKit.getUser(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java index ca011c3..a05f783 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityConferenceRecordController.java @@ -1,5 +1,6 @@ package com.casic.missiles.controller.quality; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,8 +99,8 @@ @ApiOperation("添加接口") @PostMapping(value = "/add") public ReturnDTO add(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setCreateTime(new Date()); - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setCreateTime(DateUtil.now()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); @@ -147,7 +147,7 @@ @PostMapping(value = "/update") public ReturnDTO update(@RequestBody BizQualityConferenceRecord bizQualityConferenceRecord) { - bizQualityConferenceRecord.setUpdateTime(new Date()); + bizQualityConferenceRecord.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); bizQualityConferenceRecord.setCreator(user.getId()); bizQualityConferenceRecord.setCreateName(user.getName()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java index 9168966..c3b8662 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchController.java @@ -1,14 +1,15 @@ package com.casic.missiles.controller.workbench; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizBoardCalendar; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.service.workbench.IBizBoardCalendarService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +28,7 @@ @Api(tags = "工作台") @RestController @RequestMapping("/business/workbench") -public class WorkbenchController { +public class WorkbenchController extends ExportController { @Autowired private IBizWorkbenchService workbenchService; @Autowired @@ -165,9 +166,40 @@ } /*************************************************通知公告***************************************************/ + // /system/notice/** 接口 /*************************************************审批提醒***************************************************/ + /** + * 审批提醒列表：查询用户待审批/已审批列表+审批结果通知（workbench_approval_message表） + * 已处理：对于待审批消息需要同意/拒绝处理，即已审批列表；对于审批结果通知（审批通过加到workbench_approval_message表），是标记为已处理 + */ + @ApiOperation("审批提醒列表（待处理）") + @PostMapping("/approval/toBeApprovedListPage") + @ResponseBody + public ReturnDTO> toBeApprovedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.toBeApprovedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批提醒列表（已处理）") + @PostMapping("/approval/approvedListPage") + @ResponseBody + public ReturnDTO> approvedListPage(@RequestBody @Valid ApprovalMessageRequest request) throws Exception { + List list = workbenchService.approvedListPage(request); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), list); + return ReturnUtil.success(super.packForBT(pages)); + } + + @ApiOperation("审批结果通知状态批量变更为已处理") + @PostMapping("/approval/updateStatus") + @ResponseBody + public ReturnDTO updateStatus(@RequestBody @Valid ApprovalMessageUpdateRequest updateRequest) { + return workbenchService.updateStatus(updateRequest); + } /*************************************************工作提醒***************************************************/ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index d77d33f..2ad4c3f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -5,65 +5,64 @@ import java.util.HashMap; public enum AwareActionStatusEnum implements ActionStatusBeanEnum { - EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, ""), - STANDARD_APPROVAL(STANDARD_BEAN_NAME, ""), - AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, ""), - SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, ""), - SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, ""), - CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, ""), - CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), - CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), - CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), - CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, ""), - CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, ""), - OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, ""), - CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), - SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, ""), - OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), - OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), - OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), - EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), - STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), - STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), - TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, ""), - TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, ""), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), - TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, ""), - UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, ""), - LEND_APPROVAL(LEND_BEAN_NAME, ""), - BORROW_APPROVAL(BORROW_BEAN_NAME, ""), - EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, ""), - FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, ""), - FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, ""), - FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, ""), - FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, ""), - FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, ""), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), - SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), - SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), - ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), - ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), - ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, ""), - CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), - SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), - SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, ""), - CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, ""), - QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, ""), - QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, ""), - QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), - QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, ""), - QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), - QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), - QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), - QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), - - QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), - QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), + EQUIPMENT_APPROVAL(EQUIPMENT_BEAN_NAME, BizBeanEnum.EQUIPMENT_BEAN_NAME, ""), + STANDARD_APPROVAL(STANDARD_BEAN_NAME, BizBeanEnum.STANDARD_BEAN_NAME, ""), + AUTHORIZE_ORDER_APPROVAL(AUTHORIZE_ORDER_BEAN_NAME, BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME, ""), + SEAL_USE_APPROVAL(SEAL_USE_BEAN_NAME, BizBeanEnum.SEAL_USE_BEAN_NAME, ""), + SUPPLIER_APPROVAL(SUPPLIER_BEAN_NAME, BizBeanEnum.SUPPLIER_BEAN_NAME, ""), + CUSTOMER_APPROVAL(CUSTOMER_BEAN_NAME, BizBeanEnum.CUSTOMER_BEAN_NAME, ""), + CUSTOMER_SUGGEST_FORM_APPROVAL(CUSTOMER_SUGGEST_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME, ""), + CUSTOMER_EXAMINE_FORM_APPROVAL(CUSTOMER_EXAMINE_FORM_BEAN_NAME, BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME, ""), + CUSTOMER_RESULT_REVIEW_APPROVAL(CUSTOMER_RESULT_REVIEW_BEAN_NAME, BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME, ""), + CERTIFICATE_REPORT_APPROVAL(CERTIFICATE_REPORT_BEAN_NAME, BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME, ""), + CERTIFICATE_PRINT_APPROVAL(CERTIFICATE_PRINT_BEAN_NAME, BizBeanEnum.CERTIFICATE_PRINT_BEAN_NAME, ""), + OUTSOURCER_APPROVAL(OUTSOURCER_BEAN_NAME, BizBeanEnum.OUTSOURCER_BEAN_NAME, ""), + CERTIFICATE_CHANGE_APPROVAL(CERTIFICATE_CHANGE_APPLY_BEAN_NAME, BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME, ""), + SITE_EXECUTIVE_APPROVAL(SITE_EXECUTIVE_BEAN_NAME, BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME, ""), + OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME, ""), + OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME, ""), + OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, BizBeanEnum.STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, BizBeanEnum.STANDARD_STATUS_BEAN_NAME, ""), + TRACE_PLAN_APPROVAL(TRACE_PLAN_BEAN_NAME, BizBeanEnum.TRACE_PLAN_BEAN_NAME, ""), + TRACE_RESULT_CONFIRM_APPROVAL(TRACE_RESULT_CONFIRM_BEAN_NAME, BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME, ""), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME, ""), + TRACE_CHAIN_CHANGE_APPROVAL(TRACE_CHAIN_CHANGE_BEAN_NAME, BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME, ""), + UNPACK_ACCEPT_APPROVAL(UNPACK_ACCEPT_BEAN_NAME, BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME, ""), + LEND_APPROVAL(LEND_BEAN_NAME, BizBeanEnum.LEND_BEAN_NAME, ""), + BORROW_APPROVAL(BORROW_BEAN_NAME, BizBeanEnum.BORROW_BEAN_NAME, ""), + EXCEPTION_HANDLE_APPROVAL(EXCEPTION_HANDLE_BEAN_NAME, BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME, ""), + FILE_CHANGE_FORM_APPROVAL(FILE_CHANGE_FORM_BEAN_NAME, BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME, ""), + FILE_APPROVAL_APPROVAL(FILE_APPROVAL_BEAN_NAME, BizBeanEnum.FILE_APPROVAL_BEAN_NAME, ""), + FILE_GRANT_NOTICE_APPROVAL(FILE_GRANT_NOTICE_BEAN_NAME, BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME, ""), + FILE_RECALL_ARCHIVE_APPROVAL(FILE_RECALL_ARCHIVE_BEAN_NAME, BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME, ""), + FILE_METHOD_CONFIRM_APPROVAL(FILE_METHOD_CONFIRM_BEAN_NAME, BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME, ""), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME, ""), + SOFTWARE_REVIEW_REPORT_APPROVAL(SOFTWARE_REVIEW_REPORT_BEAN_NAME, BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME, ""), + SOFTWARE_REVISION_APPLY_APPROVAL(SOFTWARE_REVISION_APPLY_BEAN_NAME, BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME, ""), + ENVIRONMENT_RESISTANCE_APPROVAL(ENVIRONMENT_RESISTANCE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME, ""), + ENVIRONMENT_VOLTAGE_APPROVAL(ENVIRONMENT_VOLTAGE_BEAN_NAME, BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME, ""), + ENVIRONMENT_UPS_APPROVAL(ENVIRONMENT_UPS_BEAN_NAME, BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME, ""), + CONSUMABLE_GOODS_APPLY_APPROVAL(CONSUMABLE_GOODS_APPLY_BEAN_NAME, BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME, ""), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME, ""), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME, ""), + SUPPLIER_SERVICE_EVALUATE_APPROVAL(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME, ""), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME, ""), + SUPPLIER_EVALUATE_APPROVAL(SUPPLIER_EVALUATE_BEAN_NAME, BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME, ""), + CHECK_RECORD_APPROVAL(CHECK_RECORD_BEAN_NAME, BizBeanEnum.CHECK_RECORD_BEAN_NAME, ""), + QUALITY_REP_APPROVAL(SUPERVISION_REP_BEAN_NAME, BizBeanEnum.SUPERVISION_REP_BEAN_NAME, ""), + QUALITY_PREVENT_REP_APPROVAL(QUALITY_PREVENT_REP_BEAN_NAME, BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME, ""), + QUALITY_CORRECTIVE_REP_APPROVAL(QUALITY_CORRECTIVE_REP_BEAN_NAME, BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME, ""), + QUALITY_SCENE_PLAN_APPROVAL(QUALITY_SCENE_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME, ""), + QUALITY_WORK_REGISTRATION_APPROVAL(QUALITY_WORK_REGISTRATION_BEAN_NAME, BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME, ""), + QUALITY_NON_CONFORMANCE_REP_APPROVAL(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME, ""), + QUALITY_REVIEW_FORM_APPROVAL(QUALITY_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_NON_REVIEW_FORM_APPROVAL(QUALITY_NON_REVIEW_FORM_BEAN_NAME, BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME, ""), + QUALITY_INTERNAL_AUDIT_REP_APPROVAL(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_PLAN_APPROVAL(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME, ""), + QUALITY_MANAGEMENT_REVIEW_REP_APPROVAL(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { //设备台账 @@ -191,10 +190,12 @@ } }); String actionBeanName; + String bizBeanName; String status; - AwareActionStatusEnum(String actionBeanName, String status) { + AwareActionStatusEnum(String actionBeanName, String bizBeanName, String status) { this.actionBeanName = actionBeanName; + this.bizBeanName = bizBeanName; this.status = status; } @@ -202,6 +203,10 @@ return actionBeanName; } + public String getBizBeanName() { + return bizBeanName; + } + public String getStatus() { return status; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java new file mode 100644 index 0000000..ca863aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/BizBeanEnum.java @@ -0,0 +1,128 @@ +package com.casic.missiles.enums.notifyevent; + +/** + * 工作台-审批提醒-使用到的获取各业务数据的bean + */ +public interface BizBeanEnum { + /*********************************计量检定业务**********************************/ + //证书报告 + String CERTIFICATE_REPORT_BEAN_NAME = "certificateReportBizBean"; + //证书打印 + String CERTIFICATE_PRINT_BEAN_NAME = "certificatePrintBizBean"; + //分包方 + String OUTSOURCER_BEAN_NAME = "outsourceBizBean"; + //证书/报告补充或更换申请单 + String CERTIFICATE_CHANGE_APPLY_BEAN_NAME = "certificateChangeApplyBizBean"; + //现场测试、校准或检定 + String SITE_EXECUTIVE_BEAN_NAME = "siteExecutiveBizBean"; + //测试、校准或检定工作分包评审表 + String OUTSOURCE_ASSESS_BEAN_NAME = "outsourceAssessBizBean"; + //测试、校准或检定工作分包协议书 + String OUTSOURCE_PROTOCOL_BEAN_NAME = "outsourceProtocolBizBean"; + //测试、校准或检定工作分包通知书 + String OUTSOURCE_NOTICE_BEAN_NAME = "outsourceNoticeBizBean"; + + /*********************************设备与装置************************************/ + //设备台账 + String EQUIPMENT_BEAN_NAME = "equipmentBizBean"; + //标准装置 + String STANDARD_BEAN_NAME = "standardBizBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBizBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBizBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBizBean"; + //溯源计划 + String TRACE_PLAN_BEAN_NAME = "tracePlanBizBean"; + //溯源结果确认 + String TRACE_RESULT_CONFIRM_BEAN_NAME = "traceResultConfirmBizBean"; + //溯源结果完成情况 + String TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME = "traceResultCompleteSituationBizBean"; + //溯源链变更 + String TRACE_CHAIN_CHANGE_BEAN_NAME = "traceChainChangeBizBean"; + //开箱验收 + String UNPACK_ACCEPT_BEAN_NAME = "unpackAcceptBizBean"; + //设备借出 + String LEND_BEAN_NAME = "lendBizBean"; + //设备借用 + String BORROW_BEAN_NAME = "borrowBizBean"; + //异常情况处置 + String EXCEPTION_HANDLE_BEAN_NAME = "exceptionHandleBizBean"; + //核查记录 + String CHECK_RECORD_BEAN_NAME = "checkRecordBizBean"; + + /*********************************资源管理************************************/ + //授权(代理)委托书 + String AUTHORIZE_ORDER_BEAN_NAME = "authorizeOrderBizBean"; + //印章使用登记 + String SEAL_USE_BEAN_NAME = "sealUseBizBean"; + //合格供方 + String SUPPLIER_BEAN_NAME = "supplierBizBean"; + //委托方名录 + String CUSTOMER_BEAN_NAME = "customerBizBean"; + //委托方意见登记表 + String CUSTOMER_SUGGEST_FORM_BEAN_NAME = "customerSuggestFormBizBean"; + //要求、委托书及合同评审表 + String CUSTOMER_EXAMINE_FORM_BEAN_NAME = "customerExamineFormBizBean"; + //检测结果复查通知单 + String CUSTOMER_RESULT_REVIEW_BEAN_NAME = "customerResultReviewNoticeBizBean"; + //文件更改申请单 + String FILE_CHANGE_FORM_BEAN_NAME = "fileChangeFormBizBean"; + //文件审批 + String FILE_APPROVAL_BEAN_NAME = "fileApprovalBizBean"; + //文件发放通知单 + String FILE_GRANT_NOTICE_BEAN_NAME = "fileGrantNoticeBizBean"; + //文件收回存档登记表 + String FILE_RECALL_ARCHIVE_BEAN_NAME = "fileRecallArchiveBizBean"; + //方法确认登记表 + String FILE_METHOD_CONFIRM_BEAN_NAME = "fileMethodConfirmBizBean"; + //测试校准检定方法查新记录表 + String FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME = "fileMethodNoveltySearchBizBean"; + //软件评审报告 + String SOFTWARE_REVIEW_REPORT_BEAN_NAME = "softwareReviewReportBizBean"; + //软件修订申请 + String SOFTWARE_REVISION_APPLY_BEAN_NAME = "softwareRevisionApplyBizBean"; + //实验室接地电阻记录 + String ENVIRONMENT_RESISTANCE_BEAN_NAME = "environmentResistanceBizBean"; + //工作间供电电压记录 + String ENVIRONMENT_VOLTAGE_BEAN_NAME = "environmentVoltageBizBean"; + //UPS蓄电池内阻测试记录 + String ENVIRONMENT_UPS_BEAN_NAME = "environmentUpsBizBean"; + //易耗物资申请单 + String CONSUMABLE_GOODS_APPLY_BEAN_NAME = "supplierConsumableGoodsApplyBizBean"; + //物资验收记录 + String SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME = "supplierGoodsAcceptanceApplyBizBean"; + //物资入库单 + String SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME = "supplierGoodsWarehouseBiz"; + //易耗物资使用记录 + String SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME = "supplierConsumableGoodsUseBiz"; + //外部服务评价表 + String SUPPLIER_SERVICE_EVALUATE_BEAN_NAME = "supplierServiceEvaluateBiz"; + //易耗物资供方评价表 + String SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME = "supplierConsumableGoodsEvaluateBiz"; + //设备供方评价表 + String SUPPLIER_EVALUATE_BEAN_NAME = "supplierEvaluateBiz"; + //质量监督报告 + String SUPERVISION_REP_BEAN_NAME = "qualitySupervisionRepBiz"; + //质量预防措施整改 + String QUALITY_PREVENT_REP_BEAN_NAME = "qualityPreventRepBiz"; + //质量纠正措施整改 Corrective + String QUALITY_CORRECTIVE_REP_BEAN_NAME = "qualityCorrectiveRepBiz"; + //现场审核计划 + String QUALITY_SCENE_PLAN_BEAN_NAME = "qualityScenePlanBiz"; + //工作登记 + String QUALITY_WORK_REGISTRATION_BEAN_NAME = "qualityWorkRegistrationBiz"; + //质量活动不符合情况分析报告 + String QUALITY_NON_CONFORMANCE_REP_BEAN_NAME = "qualityNonConformanceRepBiz"; + //内部审核检查表 + String QUALITY_REVIEW_FORM_BEAN_NAME = "qualityReviewFormBiz"; + //内部审核不符合项报告 + String QUALITY_NON_REVIEW_FORM_BEAN_NAME = "qualityNonReviewFormBiz"; + //内审报告 + String QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME = "qualityInternalAuditRepBiz"; + //管理评审计划审批 + String QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME = "qualityManagementReviewPlanBiz"; + //管理评审报告 + String QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME = "qualityManagementReviewRepBiz"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index fa841b8..ad7cf9d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -4,86 +4,92 @@ public enum ApplyFromIdEnum { /*******************************************计量检定业务*******************************************/ - CERTIFICATE_REPORT_APPROVAL("jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书报告审批"), - CERTIFICATE_PRINT_APPROVAL("jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书打印审批"), - CERTIFICATE_CHANGE_APPROVAL("jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), - OUTSOURCER_APPROVAL("jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), - SITE_EXECUTIVE_APPROVAL("jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), - OUTSOURCE_ASSESS_APPROVAL("jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), - OUTSOURCE_PROTOCOL_APPROVAL("jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), - OUTSOURCE_NOTICE_APPROVAL("jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), + CERTIFICATE_REPORT_APPROVAL("1", "jljdywzsspgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "检定审批管理"), + CERTIFICATE_PRINT_APPROVAL("2", "jljdywzsgl" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书管理"), + CERTIFICATE_CHANGE_APPROVAL("3", "jljdywzsbchghsqd" , MessageSourceModuleEnum.BUSINESS.getCode(), "证书/报告补充或更换申请单"), + OUTSOURCER_APPROVAL("4", "jljdywcsjzhgfbfml" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定合格分包方名录"), + SITE_EXECUTIVE_APPROVAL("5", "jljdywxccsjzsp" , MessageSourceModuleEnum.BUSINESS.getCode(), "现场测试、校准或检定审批"), + OUTSOURCE_ASSESS_APPROVAL("6", "jljdywcsjzfbpsb" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包评审表"), + OUTSOURCE_PROTOCOL_APPROVAL("7", "jljdywcsjzfbxys" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包协议书"), + OUTSOURCE_NOTICE_APPROVAL("8", "jljdywcsjzfbtzs" , MessageSourceModuleEnum.BUSINESS.getCode(), "测试、校准或检定工作分包通知书"), /*******************************************设备与装置*********************************************/ - EQUIPMENT_APPROVAL("sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), - STANDARD_APPROVAL("sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), - EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), - EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), - EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), - EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), - STANDARD_BUILD_APPROVAL("sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), - STANDARD_CHANGE_APPROVAL("sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), - STANDARD_REVIEW_APPROVAL("sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), - STANDARD_REVOKE_APPROVAL("sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), - TRACE_PLAN_APPROVAL("sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划"), - TRACE_RESULT_CONFIRM_APPROVAL("sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), - TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), - TRACE_CHAIN_CHANGE_APPROVAL("sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更"), - UNPACK_ACCEPT_APPROVAL("sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收"), - LEND_APPROVAL("sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出"), - BORROW_APPROVAL("sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用"), - EXCEPTION_HANDLE_APPROVAL("sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置"), - CHECK_RECORD_APPROVAL("sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), + EQUIPMENT_APPROVAL("9", "sbyzzsbtzgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账管理"), + STANDARD_APPROVAL("10", "sbyzzbzzztzxx" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("11", "sbyzzsbqfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("12", "sbyzzsbfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("13", "sbyzzsbjysq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("14", "sbyzzsbbfsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("15", "sbyzzjbgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "建标管理"), + STANDARD_CHANGE_APPROVAL("16", "sbyzzghsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("17", "sbyzzfcsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("18", "sbyzzcxsq" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), + TRACE_PLAN_APPROVAL("19", "sbyzzsyjhgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源计划管理"), + TRACE_RESULT_CONFIRM_APPROVAL("20", "sbyzzsyjgqr" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果确认"), + TRACE_RESULT_COMPLETE_SITUATION_APPROVAL("21", "sbyzzsyjgwcqk" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源结果完成情况"), + TRACE_CHAIN_CHANGE_APPROVAL("22", "sbyzzsybggl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "溯源链变更管理"), + UNPACK_ACCEPT_APPROVAL("23", "sbyzzkxysgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "开箱验收管理"), + LEND_APPROVAL("24", "sbyzzsbjcgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借出管理"), + BORROW_APPROVAL("25", "sbyzzsbjygl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备借用管理"), + EXCEPTION_HANDLE_APPROVAL("26", "sbyzzycqkczgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "异常情况处置管理"), + CHECK_RECORD_APPROVAL("27", "sbyzzhcjlgl" , MessageSourceModuleEnum.EQUIPMENT.getCode(), "核查记录管理"), /*******************************************资源管理***********************************************/ - AUTHORIZE_ORDER_APPROVAL("zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), - SEAL_USE_APPROVAL("zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记审批"), - SUPPLIER_APPROVAL("zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方审批"), - CUSTOMER_APPROVAL("zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方审批"), - CUSTOMER_SUGGEST_FORM_APPROVAL("zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表审批"), - CUSTOMER_EXAMINE_FORM_APPROVAL("zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表审批"), - CUSTOMER_RESULT_REVIEW_APPROVAL("zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知单"), - FILE_CHANGE_FORM_APPROVAL("zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件变更申请单审批"), - FILE_APPROVAL_APPROVAL("zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), - FILE_GRANT_NOTICE_APPROVAL("zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单审批"), - FILE_RECALL_ARCHIVE_APPROVAL("zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件收回存档登记表"), - FILE_METHOD_CONFIRM_APPROVAL("zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), - FILE_METHOD_NOVELTY_SEARCH_APPROVAL("zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), - SOFTWARE_REVIEW_REPORT_APPROVAL("zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), - SOFTWARE_REVISION_APPLY_APPROVAL("zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), - ENVIRONMENT_RESISTANCE_APPROVAL("zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), - ENVIRONMENT_VOLTAGE_APPROVAL("zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), - ENVIRONMENT_UPS_APPROVAL("zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), - CONSUMABLE_GOODS_APPLY_APPROVAL("zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), - SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), - SUPPLIER_GOODS_WAREHOUSE_APPROVAL("zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), - SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), - SUPPLIER_SERVICE_EVALUATE_APPROVAL("zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), - SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), - SUPPLIER_EVALUATE_APPROVAL("zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), + AUTHORIZE_ORDER_APPROVAL("28", "zyglsqwts" , MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书"), + SEAL_USE_APPROVAL("29", "zyglyzsydj" , MessageSourceModuleEnum.RESOURCE.getCode(), "印章使用登记"), + SUPPLIER_APPROVAL("30", "zyglhggfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "合格供方名录"), + CUSTOMER_APPROVAL("31", "zyglwtfml" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方名录"), + CUSTOMER_SUGGEST_FORM_APPROVAL("32", "zyglwtfyjdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "委托方意见登记表"), + CUSTOMER_EXAMINE_FORM_APPROVAL("33", "zyglyqwtsjhtpsb" , MessageSourceModuleEnum.RESOURCE.getCode(), "要求、委托书及合同评审表"), + CUSTOMER_RESULT_REVIEW_APPROVAL("34", "zygljcjgfctzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "检测结果复查通知"), + FILE_CHANGE_FORM_APPROVAL("35", "zyglwjggsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件更改申请单"), + FILE_APPROVAL_APPROVAL("36", "zyglwjsp" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件审批"), + FILE_GRANT_NOTICE_APPROVAL("37", "zyglwjfftzd" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件发放通知单"), + FILE_RECALL_ARCHIVE_APPROVAL("38", "zyglwjshcddjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "文件作废登记表"), + FILE_METHOD_CONFIRM_APPROVAL("39", "zyglffqrdjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "方法确认登记表"), + FILE_METHOD_NOVELTY_SEARCH_APPROVAL("40", "zyglcsjzjdffcxjlb" , MessageSourceModuleEnum.RESOURCE.getCode(), "测试校准检定方法查新记录表"), + SOFTWARE_REVIEW_REPORT_APPROVAL("41", "zyglrjpsbg" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件评审报告"), + SOFTWARE_REVISION_APPLY_APPROVAL("42", "zyglrjxdsq" , MessageSourceModuleEnum.RESOURCE.getCode(), "软件修订申请"), + ENVIRONMENT_RESISTANCE_APPROVAL("43", "zyglsysjddzjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "实验室接地电阻记录"), + ENVIRONMENT_VOLTAGE_APPROVAL("44", "zyglgzjgddyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "工作间供电电压记录"), + ENVIRONMENT_UPS_APPROVAL("45", "zyglupscsjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "UPS蓄电池内阻测试记录"), + CONSUMABLE_GOODS_APPLY_APPROVAL("46", "zyglyhwzsqd" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资申请单"), + SUPPLIER_GOODS_ACCEPTANCE_APPROVAL("47", "zyglwzysjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资验收记录"), + SUPPLIER_GOODS_WAREHOUSE_APPROVAL("48", "zyglwzrkd" , MessageSourceModuleEnum.RESOURCE.getCode(), "物资入库单"), + SUPPLIER_CONSUMABLE_GOODS_USE_APPROVAL("49", "zyglyhwzsyjl" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资使用记录"), + SUPPLIER_SERVICE_EVALUATE_APPROVAL("50", "zyglwbfwpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "外部服务评价表"), + SUPPLIER_CONSUMABLE_GOODS_EVALUATE_APPROVAL("51", "zyglyhwzgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "易耗物资供方评价表"), + SUPPLIER_EVALUATE_APPROVAL("52", "zyglsbgfpjb" , MessageSourceModuleEnum.RESOURCE.getCode(), "设备供方评价表"), /*******************************************质量活动***********************************************/ - QUALITY_REP_APPROVAL("zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量报告审批管理"), - QUALITY_CORRECTIVE_REP("zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), - QUALITY_PREVENT_REP("zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), - QUALITY_SCENE_PLAN("zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), - QUALITY_WORK_REGISTRATION("zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内审工作登记"), - QUALITY_NON_CONFORMANCE_REP("zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求分析报告"), - QUALITY_REVIEW_FORM("zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), - QUALITY_NON_REVIEW_FORM("zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), - QUALITY_INTERNAL_AUDIT_REP("zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), - QUALITY_MANAGEMENT_REVIEW_PLAN("zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), - QUALITY_MANAGEMENT_REVIEW_REP("zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + QUALITY_REP_APPROVAL("53", "zlhdzlbgspgl" , MessageSourceModuleEnum.QUALITY.getCode(), "质量监督报告"), + QUALITY_CORRECTIVE_REP("54", "zlhdjzcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "纠正措施处理单"), + QUALITY_PREVENT_REP("55", "zlhdyfcscld" , MessageSourceModuleEnum.QUALITY.getCode(), "预防措施处理单"), + QUALITY_SCENE_PLAN("56", "zlhdxcshjh" , MessageSourceModuleEnum.QUALITY.getCode(), "现场审核计划"), + QUALITY_WORK_REGISTRATION("57", "zhhdnbshgzdj" , MessageSourceModuleEnum.QUALITY.getCode(), "内部审核工作登记表"), + QUALITY_NON_CONFORMANCE_REP("58", "zlhdbfhyqqkfxbg", MessageSourceModuleEnum.QUALITY.getCode(), "不符合要求情况分析报告"), + QUALITY_REVIEW_FORM("59", "zlhdnbshjcb", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核检查表"), + QUALITY_NON_REVIEW_FORM("60", "zlhdnbshbfhxbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核不符合项报告"), + QUALITY_INTERNAL_AUDIT_REP("61", "zlhdnbshbg", MessageSourceModuleEnum.QUALITY.getCode(), "内部审核报告"), + QUALITY_MANAGEMENT_REVIEW_PLAN("62", "zlhdglpsjh", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审计划"), + QUALITY_MANAGEMENT_REVIEW_REP("63", "zlhdglpsbg", MessageSourceModuleEnum.QUALITY.getCode(), "管理评审报告"); + private String serialNumber;//approvalSourceModule字典code,工作台-审批提醒使用 private String code; - private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用 + private String source;//MessageSourceModuleEnum类code,工作台-工作提醒使用 private String value; - ApplyFromIdEnum(String code, String source, String value) { + ApplyFromIdEnum(String serialNumber, String code, String source, String value) { + this.serialNumber = serialNumber; this.code = code; this.source = source; this.value = value; } + public String getSerialNumber() { + return serialNumber; + } + public String getCode() { return code; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java index 156634c..3d78b1a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java @@ -1,7 +1,7 @@ package com.casic.missiles.enums.workbench; /** - * 标识消息来源模块，消息主题 + * 工作提醒-来源模块 */ public enum MessageSourceModuleEnum { BUSINESS("1", "计量检定业务"), diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 7358155..69a3fbf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -75,6 +75,7 @@ FROM biz_business_lab_executive_info blei JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id JOIN biz_business_order_info bo ON bo.id = blei.order_id + LEFT JOIN biz_business_device_measure_item_info bbdmii ON (eei.model_id = bbdmii.device_model_id) LEFT JOIN biz_business_device_measure_info bbdmi ON (bbdmi.order_id = blei.order_id AND bbdmi.sample_id = blei.sample_id) WHERE 1=1 @@ -147,7 +148,7 @@ AND bo.measure_company = #{request.measureCompany} - AND eei.category = #{request.category} + AND IF(bbdmii.device_type IS NOT NULL, bbdmii.device_type = #{request.category}, bbdmii.device_type IS NULL) and blei.id in diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index 93901d9..32152ca 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -9,19 +9,17 @@ - - + + - - - + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, biz_id, source_module, form_id, read_status, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java index e44e2b6..7aba35f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/GeneralApprovalDTO.java @@ -41,4 +41,13 @@ @JSONField(serialize = false) @TableField(exist = false) private int seq; + + @ApiModelProperty(hidden = true) + @JSONField(serialize = false) +// @TableField(exist = false) + public String createTime; + + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private String bizName; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index b893353..926367c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -226,6 +226,8 @@ String MESSAGE_SOURCE_MODULE = "messageSourceModule"; + String APPROVAL_SOURCE_MODULE = "approvalSourceModule"; + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; String CONFIG_FILE_TYPE = "configFileType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java index 79b030b..5dac66e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java @@ -14,4 +14,6 @@ private Integer decisionItem; //任务创建时间，工作台审批提醒使用 private String createTime; + //流程实例id，工作台跳转审批提醒详情使用 + private String processId; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java index d96b54d..d06b081 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/EquipmentModelInfo.java @@ -106,14 +106,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty("技术指标") @TableField(exist = false) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java index a4c161a..f5677f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/PlanEquipmentRelation.java @@ -84,13 +84,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java index 8f1bda3..6936c6a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/eqpt/SubcontractCertificate.java @@ -152,14 +152,14 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建用户id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java index fc2d5ee..8733f22 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceFileRel.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** *

* 会议关联文件 @@ -33,13 +31,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java index 6937668..1e99cbf 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityConferenceRecord.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 文件编号(默认同编码) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java index 5177d94..9afc688 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 4027e06..661115d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -8,7 +8,6 @@ import com.casic.missiles.dto.BaseRequest; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; -import com.casic.missiles.model.quality.base.IBaseFileModel; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -40,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java index 419e769..c504329 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRectifFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 纠正措施处理整改关联文件对象 biz_quality_corrective_rectif_file @@ -26,11 +25,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "关联文件类型(0 纠正措施文件 1 整改情况文件)", dataType = "Integer") @TableField("file_type") @@ -75,8 +74,8 @@ } public void buildEntity(Long moduleId, Integer moduleType, Integer fileType) { - createTime = new Date(); - updateTime = new Date(); + createTime = DateUtil.now(); + updateTime = DateUtil.now(); this.moduleId = moduleId; this.moduleType = moduleType; this.fileType = fileType; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java index cf3a925..962e5c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAudit.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java index 6d33562..bbefe93 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityExternalAuditFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityExternalAuditFile) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java index cafe0c7..882bc18 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 内审管理工作关联文件对象 biz_quality_internal_audit_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityAuditManagementFileType) @@ -105,8 +104,8 @@ public static BizQualityInternalAuditFile createEmptyEntity() { BizQualityInternalAuditFile auditFile = new BizQualityInternalAuditFile(); - auditFile.setCreateTime(new Date()); - auditFile.setUpdateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); + auditFile.setUpdateTime(DateUtil.now()); return auditFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index 0e509d7..390aeb0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -33,14 +33,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作名称(**年第**次内审)" , dataType = "String") @TableField("work_name") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java index f749dd7..1168c9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditPlan.java @@ -9,7 +9,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -47,14 +46,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java index bae3b02..c4c5944 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditRep.java @@ -40,14 +40,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java index f36c61f..ac01337 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReview.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "年度", dataType = "Long") @TableField("year_time") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java index b77f327..bb08be0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewFile.java @@ -1,13 +1,12 @@ package com.casic.missiles.model.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * 管理评审关联文件对象 biz_quality_management_review_file @@ -32,14 +31,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型(qualityManagementReviewFileType) @@ -121,8 +120,8 @@ public static BizQualityManagementReviewFile createEmptyEntity() { BizQualityManagementReviewFile reviewFile = new BizQualityManagementReviewFile(); - reviewFile.setCreateTime(new Date()); - reviewFile.setUpdateTime(new Date()); + reviewFile.setCreateTime(DateUtil.now()); + reviewFile.setUpdateTime(DateUtil.now()); return reviewFile; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java index 756e1a0..3adfee0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewPlan.java @@ -35,14 +35,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java index 82da0ca..43ce4ff 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityManagementReviewRep.java @@ -36,14 +36,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java index e3a46d8..653f46d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java index 37a8a85..f0833cd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java @@ -39,14 +39,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 实验室代码A:全站:0;X:西昌:1;H:海口:2 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java index fad63c9..be6a79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewFile.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java index cdf1021..cb49000 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonReviewForm.java @@ -41,14 +41,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java index 3afab48..aad8003 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventFileRel.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 关联文件类型 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 6b9e0df..b4e9187 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -38,14 +38,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java index 00cc599..d5e4401 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityProcessRecord.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间" , dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间" , dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 创建者 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java index ca05aae..518e4e7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityRegistrationScheduleFile.java @@ -28,12 +28,12 @@ /** 创建时间 */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** 关联文件类型 */ @ApiModelProperty(value = "关联文件类型", dataType = "Long") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java index fb66704..f9a0603 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewForm.java @@ -39,14 +39,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java index 43290d0..07b25f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityReviewFormItem.java @@ -32,14 +32,14 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 检查内容 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java index 0f789df..80f1645 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityScenePlan.java @@ -11,7 +11,6 @@ import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -38,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java index bc0f507..34e7663 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySceneSchedule.java @@ -39,7 +39,7 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 日期(yyyy-MM-dd) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java index 5a26057..6f2a202 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualitySupervisionRep.java @@ -34,13 +34,13 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "是否包含不符合项(0 不包含 1 包含)", dataType = "Integer") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java index d4c93e8..2dd58d6 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java @@ -37,14 +37,14 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java index a4d2353..210388a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplate.java @@ -34,13 +34,13 @@ */ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 更新者ID */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java index 83ea2c3..b28880d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTemplateItem.java @@ -38,14 +38,14 @@ @ApiModelProperty(value = "创建时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 */ @ApiModelProperty(value = "修改时间", dataType = "Date", accessMode = ApiModelProperty.AccessMode.READ_ONLY) @JSONField(serializeUsing = DateDeserializer.class) @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "内容标题", dataType = "String") @TableField("item_title") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java index 8431fb9..501a909 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistration.java @@ -39,7 +39,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; /** * 修改时间 @@ -47,7 +47,7 @@ @JSONField(serializeUsing = DateDeserializer.class) @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; /** * 年度 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index ab3373f..094af0a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -27,11 +27,11 @@ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") - private Date createTime; + private String createTime; @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") - private Date updateTime; + private String updateTime; @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java new file mode 100644 index 0000000..b295325 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.model.workbench; + +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/5/15 10:25 + */ +@ApiModel +@Data +public class ApprovalMessageRequest { + + @ApiModelProperty(value = "开始时间", dataType = "String") + private String startTime; + + @ApiModelProperty(value = "结束时间", dataType = "String") + private String endTime; + + @ApiModelProperty(value = "主题", dataType = "Integer") + private String messageTitle; + + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") + private String sourceModule; + + @ApiModelProperty(value = "详细信息", dataType = "Integer") + private String messageContent; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java new file mode 100644 index 0000000..8202811 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/ApprovalMessageUpdateRequest.java @@ -0,0 +1,25 @@ +package com.casic.missiles.model.workbench; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 審批提醒消息请求实体 + * @Author: wangpeng + * @Date: 2023/4/21 16:43 + */ +@ApiModel +@Data +public class ApprovalMessageUpdateRequest { + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id（待审批处理时该字段为空）", dataType = "Long") + private Long id; + + @NotNull(message = "更新状态不能为空") + @ApiModelProperty(value = "状态（1已处理0未处理）", dataType = "Integer", required = true) + private Integer status; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java index 692967a..6026891 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/BizBoardCalendar.java @@ -54,13 +54,13 @@ */ @ApiModelProperty("创建时间") @TableField("create_time") - private Date createTime; + private String createTime; /** * 更新时间 */ @ApiModelProperty("更新时间") @TableField("update_time") - private Date updateTime; + private String updateTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index fc87bef..485902f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -30,98 +30,101 @@ /** * 通知的用户id */ + @ApiModelProperty(value = "通知的用户id", dataType = "Long") @TableField("notice_id") private Long noticeId; /** * 通知的用户部门id */ + @ApiModelProperty(value = "通知的用户部门id", dataType = "Long") @TableField("notice_dept_id") private Long noticeDeptId; /** - * 消息标题 + * 消息主题(待审批通知/审批结果通知) */ + @ApiModelProperty(value = "消息主题(待审批通知/审批结果通知)", dataType = "String") @TableField("message_title") private String messageTitle; /** - * 消息内容（表单名字） + * 详细信息 */ + @ApiModelProperty(value = "详细信息", dataType = "String") @TableField("message_content") private String messageContent; - @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE) - @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String") - @TableField("message_type") - private String messageType; + /** + * 业务主键id,前端跳转审批详情使用 + */ + @ApiModelProperty(value = "业务主键id,前端跳转审批详情使用", dataType = "String") + @TableField("biz_id") + private String bizId; - @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String") - @TableField(exist = false) - private String messageTypeName; - - @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE) + @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.APPROVAL_SOURCE_MODULE) @ApiModelProperty(value = "来源模块（字典code）", dataType = "String") - @TableField("message_source_module") - private String messageSourceModule; + @TableField("source_module") + private String sourceModule; @ApiModelProperty(value = "来源模块（字典value）", dataType = "String") @TableField(exist = false) - private String messageSourceModuleName; + private String sourceModuleName; /** * 前端表单id（用于区分业务类型及页面跳转） */ + @ApiModelProperty(value = "前端表单id（用于区分业务类型及页面跳转）", dataType = "String") @TableField("form_id") private String formId; /** - * 1已读0未读 + * 处置情况：1已处理 0未处理 */ - @TableField("status") - private Integer status; + @ApiModelProperty(value = " 处置情况：1已处理 0未处理", dataType = "String") + @TableField("read_status") + private Integer readStatus; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间", dataType = "String") @TableField("update_time") private String updateTime; /** - * 业务表主键，前端跳转审批详情使用 - */ - @TableField("business_id") - private String businessId; - - /** * 流程实例id，前端跳转审批详情使用 */ - @TableField("process_id") + @ApiModelProperty(value = "流程实例id，前端跳转审批详情使用", dataType = "String") + @TableField(exist = false) private String processId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private String taskId; /** * 前端跳转审批详情使用 */ + @ApiModelProperty(value = "前端跳转审批详情使用", dataType = "String") @TableField(exist = false) private Integer decisionItem; - @ApiModelProperty(value = "其他跳转参数", dataType = "Object") - @TableField(exist = false) - private Object skipParamsObject = new Object(); - - //删除标志，用于删除在库中已删除的数据 - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private int del = 0; +// @ApiModelProperty(value = "其他跳转参数", dataType = "Object") +// @TableField(exist = false) +// private Object skipParamsObject = new Object(); +// +// //删除标志，用于删除在库中已删除的数据 +// @ApiModelProperty(hidden = true) +// @TableField(exist = false) +// private int del = 0; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java index 6823b62..fccdf5b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/IGeneralApprovalService.java @@ -39,4 +39,6 @@ List listExportByIds(List ids); List exportFileList(R request, HttpServletResponse response) throws Exception; + + void setBizName(T obj); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 21919bc..9b4dde0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -281,6 +281,7 @@ toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey()); toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项 toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + toBeApprovedDTO.setProcessId(task.getProcessInstanceId()); toBeApprovedDTOs.add(toBeApprovedDTO); } //返回任务id和关联业务主键id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index a8f044e..b39d0ec 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -209,6 +210,11 @@ return records; } + @Override + public void setBizName(T obj) { + + } + protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); @@ -282,6 +288,31 @@ return resultApprovalPage; } + public List handlerBeApproved(String formId) { + List businessKeys = new ArrayList<>(); + List toBeApprovedList = baseApprovalService.getToBeApprovedList(formId); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); + } + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> { + setBizName(l); + Optional toBeApprovedOpt = toBeApprovedList.stream().filter(i -> i.getBusinessKey().equals(l.getId().toString())).findAny(); + if (toBeApprovedOpt.isPresent()) { + ToBeApprovedDTO toBeApprovedDTO = toBeApprovedOpt.get(); + l.setTaskId(toBeApprovedDTO.getTaskId()); + l.setProcessId(toBeApprovedDTO.getProcessId()); + l.setDecisionItem(toBeApprovedDTO.getDecisionItem()); + l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); + } + }); + } + return new ArrayList<>(); + } + private Page handlerApproved(Page resultApprovalPage, Page page, R request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { @@ -293,4 +324,17 @@ } return resultApprovalPage; } + + public List handlerApprovedList(String formId) { + List businessKeys = baseApprovalService.getAlreadyApprovalList(formId); + if (!CollectionUtils.isEmpty(businessKeys)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", businessKeys); + List list = this.list(queryWrapper); + list.forEach(l -> setBizName(l)); + return list; + } + return new ArrayList<>(); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java index 02b935e..63d8129 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificateChangeApplyServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessCertificateChangeApplyMapper; @@ -33,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_CERTIFICATE_CHANGE_APPLY; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_CHANGE_APPLY_BEAN_NAME; /** *

@@ -42,7 +42,7 @@ * @author wangpeng * @since 2023-08-15 */ -@Service +@Service(CERTIFICATE_CHANGE_APPLY_BEAN_NAME) public class BizBusinessCertificateChangeApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessCertificateChangeApplyService { @Autowired @@ -97,4 +97,9 @@ } } + @Override + public void setBizName(BizBusinessCertificateChangeApply obj) { + obj.setBizName(obj.getChangeApplyName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 8513729..1a161ee 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -49,6 +49,7 @@ * @since 2023-08-15 */ @Service +//(CERTIFICATE_PRINT_BEAN_NAME) public class BizBusinessCertificatePrintServiceImpl extends ServiceImpl implements IBizBusinessCertificatePrintService { @Autowired private BizBusinessCertificatePrintMapper certificatePrintMapper; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f333f16..dc13e81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CERTIFICATE_REPORT_BEAN_NAME; + /** *

* 计量检定业务-任务计量管理-检定审批管理 服务实现类 @@ -50,7 +52,7 @@ * @author wangpeng * @since 2023-10-11 */ -@Service +@Service(CERTIFICATE_REPORT_BEAN_NAME) public class BizBusinessDeviceMeasureApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessDeviceMeasureApprovalService { @Resource private BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; @@ -230,5 +232,8 @@ return measureApprovalMapper.getAmountGroupByConclusion(request, userId); } - + @Override + public void setBizName(BizBusinessDeviceMeasureApproval obj) { + obj.setBizName(obj.getCertificateName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java index e73b559..16784f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceAssessServiceImpl.java @@ -38,6 +38,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_ASSESS_BEAN_NAME; /** *

@@ -47,7 +48,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCE_ASSESS_BEAN_NAME) public class BizBusinessOutsourceAssessServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceAssessService { @Autowired private IBizBusinessOutsourceAssessSampleRelationService outsourceAssessSampleRelationService; @@ -146,6 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourceAssess obj) { + obj.setBizName(obj.getProjectName()); + } + private void saveRelationData(BizBusinessOutsourceAssess request) { List sampleRelations = new ArrayList<>(); request.getOrderSampleList().forEach(dto -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java index 01c6c92..a887b6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceNoticeServiceImpl.java @@ -20,7 +20,6 @@ import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessSampleRelationService; -import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import com.casic.missiles.service.business.IBizBusinessOutsourceNoticeService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; @@ -30,12 +29,12 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_NOTICE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_NOTICE_BEAN_NAME; /** *

@@ -45,7 +44,7 @@ * @author wangpeng * @since 2023-08-28 */ -@Service +@Service(OUTSOURCE_NOTICE_BEAN_NAME) public class BizBusinessOutsourceNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceNoticeService { @Autowired private PrintFileRegister printFileRegister; @@ -110,4 +109,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_NOTICE, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceNotice obj) { + obj.setBizName(obj.getNoticeName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java index 1f2c160..45e12d7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourceProtocolServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_PROTOCOL; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCE_PROTOCOL_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-08-24 */ -@Service +@Service(OUTSOURCE_PROTOCOL_BEAN_NAME) public class BizBusinessOutsourceProtocolServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourceProtocolService { @Autowired private BizBusinessOutsourcerInfoMapper outsourcerInfoMapper; @@ -85,4 +86,9 @@ printFileRegister.registerPrintFile(OUTSOURCE_PROTOCOL, "1", null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizBusinessOutsourceProtocol obj) { + obj.setBizName(obj.getProjectName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 2832dfa..511a2b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -32,6 +32,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.OUTSOURCER_BEAN_NAME; /** *

@@ -41,7 +42,7 @@ * @author wangpeng * @since 2023-08-16 */ -@Service +@Service(OUTSOURCER_BEAN_NAME) public class BizBusinessOutsourcerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessOutsourcerInfoService { @Autowired private IBizBusinessOutsourcerAbilityService outsourcerAbilityService; @@ -152,4 +153,8 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizBusinessOutsourcerInfo obj) { + obj.setBizName(obj.getOutsourcerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java index 24f24e0..b5af05a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessSiteExecutiveInfoServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessSiteExecutiveInfoMapper; @@ -47,6 +46,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.BUSINESS_SITE_EXECUTIVE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SITE_EXECUTIVE_BEAN_NAME; /** *

@@ -56,7 +56,7 @@ * @author wangpeng * @since 2023-08-17 */ -@Service +@Service(SITE_EXECUTIVE_BEAN_NAME) public class BizBusinessSiteExecutiveInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizBusinessSiteExecutiveInfoService { @Autowired private IBizBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveInfoEquipmentRelationService; @@ -199,6 +199,11 @@ } } + @Override + public void setBizName(BizBusinessSiteExecutiveInfo obj) { + obj.setBizName(obj.getSiteExecutiveName()); + } + private void saveRelationInfo(BizBusinessSiteExecutiveInfo siteExecutiveInfo) { List equipmentIdList = siteExecutiveInfo.getEquipmentIdList(); List equipmentList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java index 699a18c..9b753d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java @@ -37,7 +37,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.BORROW_BEAN_NAME; /** @@ -48,7 +53,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(BORROW_BEAN_NAME) public class BizEquipmentBorrowServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentBorrowService { @Autowired private IBizEquipmentBorrowAttachmentService attachmentService; @@ -226,6 +231,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentBorrow obj) { + obj.setBizName(obj.getRegisterName()); + } + private void removeRelationData(Long borrowId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("borrow_id", borrowId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java index 40a0f69..9276c35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EXCEPTION_HANDLE_BEAN_NAME; + /** *

* 设备履历管理-异常情况处置管理 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-07 */ -@Service +@Service(EXCEPTION_HANDLE_BEAN_NAME) public class BizEquipmentExceptionHandleServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentExceptionHandleService { @Autowired @@ -88,4 +90,9 @@ }); return ReturnUtil.success(resultList); } + + @Override + public void setBizName(BizEquipmentExceptionHandle obj) { + obj.setBizName(obj.getReportName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 10f441c..9d0890e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -1232,7 +1232,7 @@ /** * 查询待审批状态数据，并填充相应的工作流状态 */ - private Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -1260,7 +1260,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, EquipmentApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java index 060ee8f..80b39ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentLendServiceImpl.java @@ -38,6 +38,8 @@ import java.text.SimpleDateFormat; import java.util.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.LEND_BEAN_NAME; + /** *

* 设备履历管理-设备借出管理 服务实现类 @@ -46,7 +48,7 @@ * @author wangpeng * @since 2023-09-06 */ -@Service +@Service(LEND_BEAN_NAME) public class BizEquipmentLendServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentLendService { @Autowired private IBizEquipmentLendAttachmentService attachmentService; @@ -239,4 +241,9 @@ } return ReturnUtil.success(); } + + @Override + public void setBizName(BizEquipmentLend obj) { + obj.setBizName(obj.getRegisterName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java index be69617..251cea6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardBuildServiceImpl.java @@ -1,6 +1,9 @@ package com.casic.missiles.service.Impl.equipment; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; @@ -15,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_BUILD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-标准建立 服务实现类 @@ -23,7 +28,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_BUILD_BEAN_NAME) public class BizEquipmentStandardBuildServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardBuildService { @Override @@ -59,4 +64,9 @@ } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + + @Override + public void setBizName(BizEquipmentStandardBuild obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 25316a0..17e0c98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,9 +18,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentStandardCheckRecordApprovalMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; -import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; @@ -33,10 +30,11 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CHECK_RECORD_BEAN_NAME; + /** *

* 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 服务实现类 @@ -45,7 +43,7 @@ * @author wangpeng * @since 2023-10-14 */ -@Service +@Service(CHECK_RECORD_BEAN_NAME) public class BizEquipmentStandardCheckRecordApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardCheckRecordApprovalService { @Autowired @@ -187,4 +185,8 @@ return ReturnUtil.success(approval); } + @Override + public void setBizName(BizEquipmentStandardCheckRecordApproval obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 9883670..43ef9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -864,7 +864,7 @@ return resultApprovalPage; } - private Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerBeApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = new ArrayList<>(); List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); if (!CollectionUtils.isEmpty(toBeApprovedList)) { @@ -892,7 +892,7 @@ return resultApprovalPage; } - private Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { + public Page handlerApproved(Page resultApprovalPage, Page page, StandardApprovalListRequest request) { List businessKeys = baseApprovalService.getAlreadyApprovalList(request.getFormId()); if (!CollectionUtils.isEmpty(businessKeys)) { request.setApprovalStatus(""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java index c139577..ba2bfaa 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardStatusServiceImpl.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.STANDARD_STATUS_BEAN_NAME; + /** *

* 设备与装置-标准装置状态维护 服务实现类 @@ -35,7 +37,7 @@ * @author wangpeng * @since 2023-08-31 */ -@Service +@Service(STANDARD_STATUS_BEAN_NAME) public class BizEquipmentStandardStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStandardStatusService { @Autowired private BizEquipmentStandardChangeRelationMapper changeRelationMapper; @@ -94,6 +96,11 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizEquipmentStandardStatus obj) { + obj.setBizName(obj.getApplyName()); + } + private void changeAndchangedHandle(BizEquipmentStandardStatus request, Long id, int changeType) { BizEquipmentStandardChangeRelation changeRelation = new BizEquipmentStandardChangeRelation(); changeRelation.setChangeType(changeType); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index c370c9c..830b9f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.*; import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; @@ -10,7 +9,6 @@ import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentAttachmentMapper; @@ -27,7 +25,6 @@ import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -37,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.EQUIPMENT_STATUS_BEAN_NAME; /** *

@@ -49,7 +46,7 @@ * @author wangpeng * @since 2023-08-30 */ -@Service +@Service(EQUIPMENT_STATUS_BEAN_NAME) public class BizEquipmentStatusServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentStatusService { @Autowired private BizEquipmentTechnicalTargetMapper technicalTargetMapper; @@ -172,5 +169,8 @@ } } - + @Override + public void setBizName(BizEquipmentStatus obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java index 0dbcbf0..5fbcc96 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceChainChangeServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.springframework.stereotype.Service; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_CHAIN_CHANGE_BEAN_NAME; + /** *

* 溯源管理-溯源链变更管理 服务实现类 @@ -26,7 +28,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(TRACE_CHAIN_CHANGE_BEAN_NAME) public class BizEquipmentTraceChainChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceChainChangeService { @Override @@ -53,4 +55,9 @@ DictCodeUtils.convertDictCodeToName(traceChainChange); return ReturnUtil.success(traceChainChange); } + + @Override + public void setBizName(BizEquipmentTraceChainChange obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java index 18e3698..d1ee92d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTracePlanServiceImpl.java @@ -41,6 +41,8 @@ import java.util.List; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_PLAN_BEAN_NAME; + /** *

* 设备与装置-溯源管理-溯源计划 服务实现类 @@ -49,7 +51,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_PLAN_BEAN_NAME) public class BizEquipmentTracePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTracePlanService { @Autowired private IBizEquipmentTracePlanEquipmentService tracePlanEquipmentService; @@ -165,4 +167,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_TRANSPORTATION_PROCESS, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } + @Override + public void setBizName(BizEquipmentTracePlan obj) { + obj.setBizName(obj.getPlanName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java index 22f5939..eb9a809 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultCompleteSituationServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -14,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentTraceResultCompleteSituationMapper; @@ -31,10 +29,14 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_COMPLETE_SITUATION; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME; /** *

@@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-09-22 */ -@Service +@Service(TRACE_RESULT_COMPLETE_SITUATION_BEAN_NAME) public class BizEquipmentTraceResultCompleteSituationServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultCompleteSituationService { @Autowired private IBizEquipmentTraceResultCompleteSituationRelationService relationService; @@ -154,6 +156,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultCompleteSituation obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("situation_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java index eb597de..f17d923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTraceResultConfirmServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; @@ -38,6 +37,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.EQUIPMENT_TRACE_RESULT_CONFIRM; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.TRACE_RESULT_CONFIRM_BEAN_NAME; /** *

@@ -47,7 +47,7 @@ * @author wangpeng * @since 2023-09-04 */ -@Service +@Service(TRACE_RESULT_CONFIRM_BEAN_NAME) public class BizEquipmentTraceResultConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentTraceResultConfirmService { @Autowired private IBizEquipmentTraceResultConfirmQuantityService quantityService; @@ -169,6 +169,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentTraceResultConfirm obj) { + obj.setBizName(obj.getConfirmName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("result_confirm_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index 3f82918..9a1f70c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.UNPACK_ACCEPT_BEAN_NAME; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -47,7 +49,7 @@ * @author wangpeng * @since 2023-09-05 */ -@Service +@Service(UNPACK_ACCEPT_BEAN_NAME) public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; @@ -178,6 +180,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizEquipmentUnpackAccept obj) { + obj.setBizName(obj.getLogName()); + } + private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 9cc9e96..b5ced4c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -26,7 +26,6 @@ import com.casic.missiles.dto.quality.FileRelDTO; import com.casic.missiles.dto.quality.FileRelResultDTO; import com.casic.missiles.dto.quality.approval.BizQualityCorrectiveApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.*; import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; @@ -57,9 +56,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_CORRECTIVE_REP_BEAN_NAME; /** @@ -70,7 +69,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_CORRECTIVE_REP_BEAN_NAME) public class BizQualityCorrectiveRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityCorrectiveRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -116,8 +115,8 @@ entity.setSourceType(getSourceType(entity).getCode()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -131,7 +130,7 @@ @Override public boolean updateById(BizQualityCorrectiveRecord entity) { BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); @@ -228,6 +227,11 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizQualityCorrectiveRecord obj) { + obj.setBizName(obj.getFileName()); + } + /** * 关联文件查询 * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java index f3c0a5b..a26e4a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityEffectiveAnalysisServiceImpl.java @@ -15,19 +15,16 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityEffectiveAnalysisMapper; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysis; import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; -import com.casic.missiles.model.quality.BizQualityManagementOperationRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisContentService; import com.casic.missiles.service.quality.IBizQualityEffectiveAnalysisService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,7 +40,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_EFFECTIVE_ANALYSIS; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 8a80c4d..1196228 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -62,9 +62,9 @@ removeBatchByIds(rmIds); auditFiles.forEach(auditFile -> { auditFile.setExternalAuditId(id); - auditFile.setUpdateTime(new Date()); + auditFile.setUpdateTime(DateUtil.now()); if (auditFile.getId() == null) { - auditFile.setCreateTime(new Date()); + auditFile.setCreateTime(DateUtil.now()); } }); saveOrUpdateBatch(auditFiles); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index 51f592f..e24d642 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -376,8 +376,8 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); super.save(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; @@ -397,7 +397,7 @@ Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); auditFileService.saveList(entity.getAuditFiles(), entity.getId()); return true; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java index 0194597..6387311 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +17,10 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -45,8 +49,8 @@ public void saveFileList(List internalAuditFiles, Long managementId) { AuthUser user = permissionContext.getAuthService().getLoginUser(); for (BizQualityInternalAuditFile internalAuditFile : internalAuditFiles) { - internalAuditFile.setCreateTime(new Date()); - internalAuditFile.setUpdateTime(new Date()); + internalAuditFile.setCreateTime(DateUtil.now()); + internalAuditFile.setUpdateTime(DateUtil.now()); internalAuditFile.setManagementId(managementId); internalAuditFile.setCreateId(user.getId()); internalAuditFile.setCreateName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java index 75e4f3f..067c6e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditManagementServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,8 +13,6 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.certificate.CompressParameter; -import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.DictDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.quality.QualityAuditManagementStageOptTypeEnum; @@ -22,10 +21,12 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditManagementMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityInternalAuditFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditManagement; +import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; +import com.casic.missiles.model.quality.BizQualityInternalPlanUser; import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; -import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.utils.QualityNoUtil; @@ -36,20 +37,19 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SUPERVISION_RECORD; - /** *

@@ -107,7 +107,7 @@ management.setGroupLeader(entity.getGroupLeaderName()); management.setIsInclude(1); management.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - management.setUpdateTime(new Date()); + management.setUpdateTime(DateUtil.now()); if (CollectionUtil.isNotEmpty(entity.getPlanUserList())) { List planUserList = entity.getPlanUserList(); String teamMembers = planUserList.stream().map(BizQualityInternalPlanUser::getUserName).collect(Collectors.joining()); @@ -128,7 +128,7 @@ long num = count(lambdaQuery); if (num == 0) { - management.setCreateTime(new Date()); + management.setCreateTime(DateUtil.now()); management.setBeginTime(new Date()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); management.setCommanderName(authUser.getName()); @@ -168,7 +168,7 @@ @Transactional @Override public boolean updateById(BizQualityInternalAuditManagement entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); if (CollectionUtil.isNotEmpty(entity.getInternalAuditFiles())) { LambdaQueryWrapper query = new LambdaQueryWrapper(); @@ -331,8 +331,8 @@ private BizQualityInternalAuditManagement initEntity(BizQualityInternalAuditManagement entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setIsInclude(0); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); return entity; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java index ad455fd..3528c42 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditPlanServiceImpl.java @@ -21,7 +21,6 @@ import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditPlan; import com.casic.missiles.model.quality.BizQualityInternalPlanUser; -import com.casic.missiles.model.quality.BizQualityNonConformanceFileRel; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -32,8 +31,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.collections.CollectionUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -43,14 +40,19 @@ import java.io.File; import java.io.Serializable; import java.text.SimpleDateFormat; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_AUDIT_PLAN; /** *

@@ -124,7 +126,7 @@ map.put("groupLeaderName", userInfo.getName()); map.put("fileName", sign.getMinioFileName()); if (bizQualityInternalAuditPlan.getCreateTime() != null) { - String date = DateUtil.format(bizQualityInternalAuditPlan.getCreateTime(), "yyyy年MM月dd日"); + String date = DateUtil.format(LocalDateTime.parse(bizQualityInternalAuditPlan.getCreateTime()), "yyyy年MM月dd日"); map.put("recordDate", date); } return map; @@ -184,9 +186,9 @@ @Override public boolean save(BizQualityInternalAuditPlan entity) { if (entity.getCreateTime() == null) { - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -211,7 +213,7 @@ BizQualityInternalAuditPlan oldPlan = getById(entity.getId()); updateEntity(entity, oldPlan, QualityTableEnum.INTERNAL_AUDIT_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); planUserService.saveList(entity.getPlanUserList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index ab0ce3f..3f462a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -20,13 +20,13 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityInternalAuditRepVO; import com.casic.missiles.dto.quality.approval.BizQualityInternalAuditRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityInternalAuditRepMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityAuditRepDept; +import com.casic.missiles.model.quality.BizQualityAuditRepUser; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.system.SystemSign; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -36,10 +36,7 @@ import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -56,7 +52,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_INTERNAL_AUDIT_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME; /** *

@@ -66,7 +64,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_INTERNAL_AUDIT_REP_BEAN_NAME) public class BizQualityInternalAuditRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityInternalAuditRepService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -98,8 +96,8 @@ @Transactional @Override public boolean save(BizQualityInternalAuditRep entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -121,7 +119,7 @@ BizQualityInternalAuditRep old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -276,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityInternalAuditRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index e821e15..f1fa24e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -3,53 +3,50 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.constants.MeterDictCode; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; +import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewPlanApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.enums.quality.QualityDictTypeEnum; +import com.casic.missiles.enums.quality.QualityTableEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; +import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; +import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.casic.missiles.service.quality.IBizQualityManagementReviewPlanService; - -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.casic.missiles.mapper.quality.BizQualityManagementReviewPlanMapper; -import com.casic.missiles.model.quality.BizQualityManagementReviewPlan; -import com.casic.missiles.dto.BaseApprovalSubmitRequest; -import com.casic.missiles.dto.quality.BizQualityManagementReviewPlanVO; -import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.utils.QualityNoUtil; -import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; - -import com.casic.missiles.core.application.context.AbstractPermissionContext; -import com.casic.missiles.core.application.service.AbstractDictService; -import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.constants.MeterDictCode; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME; /** *

@@ -59,7 +56,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_PLAN_BEAN_NAME) public class BizQualityManagementReviewPlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewPlanService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -146,8 +143,8 @@ @Override public boolean save(BizQualityManagementReviewPlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); @@ -174,7 +171,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); return true; @@ -230,4 +227,8 @@ return approvalOperateService.agree(request); } + @Override + public void setBizName(BizQualityManagementReviewPlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index 7c496c4..59caf66 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -18,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityManagementReviewRepVO; import com.casic.missiles.dto.quality.approval.BizQualityManagementReviewRepApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewRepMapper; import com.casic.missiles.model.quality.BizQualityManagementReviewRep; import com.casic.missiles.model.quality.BizQualityReviewRepItem; -import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewRepService; @@ -48,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_REPORT; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME; /** *

@@ -58,7 +58,7 @@ * @author lwh * @date 2023-11-21 */ -@Service +@Service(QUALITY_MANAGEMENT_REVIEW_REP_BEAN_NAME) public class BizQualityManagementReviewRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityManagementReviewRepService { private final AbstractDictService dictService; private final AbstractPermissionContext permissionContext; @@ -151,8 +151,8 @@ @Override public boolean save(BizQualityManagementReviewRep entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -182,7 +182,7 @@ entity.setFileCode(newCode); entity.setSysCode(newCode); } - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); itemService.saveList(entity.getRepItems(), entity.getId()); @@ -245,4 +245,9 @@ public ReturnDTO agree(BizQualityManagementReviewRepApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityManagementReviewRep obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java index 13afdc1..4a7ed67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,8 +17,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.mapper.quality.BizQualityManagementReviewMapper; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.quality.BizQualityExternalAudit; -import com.casic.missiles.model.quality.BizQualityExternalAuditFile; import com.casic.missiles.model.quality.BizQualityManagementReview; import com.casic.missiles.model.quality.BizQualityManagementReviewFile; import com.casic.missiles.model.quality.base.IBaseFileModel; @@ -126,8 +125,8 @@ BizQualityManagementReview review = new BizQualityManagementReview(); String format = "%s年第%s次管理评审"; review.setWorkName(String.format(format, target.getYearTime(), target.getYearNum())); - review.setCreateTime(new Date()); - review.setUpdateTime(new Date()); + review.setCreateTime(DateUtil.now()); + review.setUpdateTime(DateUtil.now()); review.setIsInclude(1); review.setYearNo(QualityNoUtil.convertToYearNo(target.getBizLabCode(), target.getYearTime(), target.getYearNum())); AuthUser user = permissionContext.getAuthService().getLoginUser(); @@ -232,8 +231,8 @@ if (StrUtil.isEmpty(entity.getCommanderName())) { entity.setCommanderName(user.getName()); } - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); //默认0 不包含 @@ -258,7 +257,7 @@ @Transactional @Override public boolean updateById(BizQualityManagementReview entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); if (CollectionUtil.isNotEmpty(entity.getReviewFileList())) { reviewFileService.saveList(entity.getReviewFileList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 44a289f..bd47090 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -23,10 +23,7 @@ import com.casic.missiles.dto.quality.BizQualityNonConformanceRepVO; import com.casic.missiles.dto.quality.approval.BizQualityNonConformanceRepApprovalVO; import com.casic.missiles.enums.quality.QualityDictTypeEnum; -import com.casic.missiles.enums.quality.QualityFileNoEnum; -import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; -import com.casic.missiles.enums.resource.LabCodeDictEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper; @@ -37,13 +34,8 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.service.system.ISystemSignService; -import com.casic.missiles.utils.NoGeneratorUtil; -import com.casic.missiles.utils.TemplateUtils; import com.casic.missiles.utils.ZipUtils; -import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -52,7 +44,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.Serializable; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -61,6 +52,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_CONFORMANCE_REP_BEAN_NAME; /** @@ -71,7 +63,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_NON_CONFORMANCE_REP_BEAN_NAME) public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonConformanceRepService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; /** @@ -323,6 +315,10 @@ return this.baseMapper.selectById(targetId); } + @Override + public void setBizName(BizQualityNonConformanceRep obj) { + obj.setBizName(obj.getFileName()); + } private void preventRecordTask(BizQualityNonConformanceRep nonConformanceRep, String currentFileName, ThreadPoolExecutor threadPool, List> futures) { if (CollectionUtils.isNotEmpty(nonConformanceRep.getPreventRecords())) { @@ -453,8 +449,8 @@ //创建时间 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -473,7 +469,7 @@ BizQualityNonConformanceRep oldRep = getById(entity.getId()); updateEntity(entity, oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java index 9458f6e..01eac8d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFileServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +14,6 @@ import com.casic.missiles.service.quality.IBizQualityNonReviewFileService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -48,8 +48,8 @@ if (nonReviewFile.getFileType() == null) { nonReviewFile.setFileType(NonReviewRelFileTypeEnum.PROBLEM.getCode()); } - nonReviewFile.setCreateTime(new Date()); - nonReviewFile.setUpdateTime(new Date()); + nonReviewFile.setCreateTime(DateUtil.now()); + nonReviewFile.setUpdateTime(DateUtil.now()); nonReviewFile.setCreateId(user.getId()); nonReviewFile.setCreateName(user.getName()); nonReviewFile.setNonReviewId(id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index c376611..8d36290 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,18 +20,14 @@ import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.NonReviewRelFileTypeEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; -import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; import com.casic.missiles.model.quality.BizQualityNonReviewForm; -import com.casic.missiles.model.quality.BizQualityReviewForm; -import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -40,7 +37,6 @@ import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,6 +56,7 @@ import java.util.concurrent.TimeUnit; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_NON_REVIEW_FORM_BEAN_NAME; /** *

@@ -69,7 +66,7 @@ * @author lwh * @date 2023-11-14 */ -@Service +@Service(QUALITY_NON_REVIEW_FORM_BEAN_NAME) public class BizQualityNonReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityNonReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final IBizQualityInternalAuditManagementService internalAuditManagementService; @@ -93,8 +90,8 @@ @Override public boolean save(BizQualityNonReviewForm entity) { - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); @@ -127,7 +124,7 @@ BizQualityNonReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); return true; @@ -277,4 +274,9 @@ internalAuditManagementService.addBizQualityInternalAuditFile(entity); return super.submit(request); } + + @Override + public void setBizName(BizQualityNonReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 3c5d0fc..c8b9468 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -59,6 +59,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_PREVENT_REP_BEAN_NAME; /** @@ -69,7 +70,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(QUALITY_PREVENT_REP_BEAN_NAME) public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -191,11 +192,11 @@ //获取资源类型 AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setSourceType(getSourceType(entity).getCode()); - entity.setCreateTime(new Date()); + entity.setCreateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); //设置系统编码 saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); @@ -397,6 +398,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualityPreventRecord obj) { + obj.setBizName(obj.getFileName()); + } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java index 7f8ba54..c3116b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,7 +13,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @@ -43,9 +43,9 @@ for (BizQualityProcessRecord processRecord : processRecords) { processRecord.setSuperRecordId(id); if (processRecord.getId() == null) { - processRecord.setCreateTime(new Date()); + processRecord.setCreateTime(DateUtil.now()); } - processRecord.setUpdateTime(new Date()); + processRecord.setUpdateTime(DateUtil.now()); processRecord.setCreator(permissionContext.getAuthService().getLoginUser().getId()); } saveOrUpdateBatch(processRecords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index eac395b..cbb92e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -19,21 +19,18 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityReviewFormApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityReviewFormMapper; import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.model.quality.BizQualityReviewFormItem; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityInternalAuditManagementService; import com.casic.missiles.service.quality.IBizQualityReviewFormItemService; import com.casic.missiles.service.quality.IBizQualityReviewFormService; import com.casic.missiles.service.quality.base.IBaseFileService; -import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -49,7 +46,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_REVIEW_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_REVIEW_FORM_BEAN_NAME; /** *

@@ -59,7 +58,7 @@ * @author lwh * @date 2023-11-15 */ -@Service +@Service(QUALITY_REVIEW_FORM_BEAN_NAME) public class BizQualityReviewFormServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityReviewFormService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -194,8 +193,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); @@ -223,7 +222,7 @@ BizQualityReviewForm old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); //修改工作管理计划内容 @@ -259,4 +258,9 @@ public ReturnDTO agree(BizQualityReviewFormApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityReviewForm obj) { + obj.setBizName(obj.getFileName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 39897b3..612ee5d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,7 +28,6 @@ import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -39,7 +38,6 @@ import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -56,7 +54,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_SCENE_AUDIT_PLAN; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_SCENE_PLAN_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author lwh * @date 2023-11-10 */ -@Service +@Service(QUALITY_SCENE_PLAN_BEAN_NAME) public class BizQualityScenePlanServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityScenePlanService, IBaseFileService { private final AbstractPermissionContext permissionContext; /** @@ -202,8 +202,8 @@ @Override public boolean save(BizQualityScenePlan entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); saveScenePlan(entity); @@ -235,7 +235,7 @@ BizQualityScenePlan old = getById(entity.getId()); updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); sceneUserService.saveList(entity.getSceneUsers(), entity.getId()); @@ -288,4 +288,9 @@ public ReturnDTO agree(BizQualityScenePlanApprovalVO request) { return approvalOperateService.agree(request); } + + @Override + public void setBizName(BizQualityScenePlan obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java index 78daf28..671a0cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySceneScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,7 +11,6 @@ import com.casic.missiles.service.quality.IBizQualitySceneScheduleService; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @@ -35,7 +35,7 @@ if (CollectionUtil.isNotEmpty(sceneSchedules)) { remove(new LambdaQueryWrapper().eq(BizQualitySceneSchedule::getScenePlanId, sceneId)); sceneSchedules.forEach(sceneSchedule -> { - sceneSchedule.setCreateTime(new Date()); + sceneSchedule.setCreateTime(DateUtil.now()); sceneSchedule.setScenePlanId(sceneId); }); saveBatch(sceneSchedules); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index afcaca2..98bc4de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -5,9 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.druid.util.HttpClientUtils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +12,10 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.*; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; @@ -23,7 +23,6 @@ import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -31,32 +30,14 @@ import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; import com.casic.missiles.utils.ZipUtils; -import com.google.gson.JsonObject; import org.apache.commons.collections.CollectionUtils; -import org.apache.http.*; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.HttpClient; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; -import org.codehaus.groovy.syntax.TokenUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -67,6 +48,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPERVISION_REP_BEAN_NAME; /** @@ -77,7 +59,7 @@ * @author lwh * @date 2023-10-21 */ -@Service +@Service(SUPERVISION_REP_BEAN_NAME) public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl implements IBizQualitySupervisionRepService, IBaseFileCodeService { private final IBizQualityRepRelService bizQualityRepRelService; private final AbstractPermissionContext permissionContext; @@ -227,6 +209,11 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public void setBizName(BizQualitySupervisionRep obj) { + obj.setBizName(obj.getFileName()); + } + /** * 预防措施单任务 * @@ -389,8 +376,8 @@ //设置最大编码 saveEntity(entity, entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java index d6d25c2..33cd04a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTechnicalAnalysisRepServiceImpl.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,27 +13,22 @@ import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.certificate.CompressParameter; import com.casic.missiles.dto.certificate.RegisterCustomParameters; -import com.casic.missiles.dto.quality.BizQualityTechnicalAnalysisRepVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualityTechnicalAnalysisRepMapper; -import com.casic.missiles.model.quality.BizQualityEffectiveAnalysisContent; import com.casic.missiles.model.quality.BizQualityTechnicalAnalysisRep; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.IBizQualityManagementReviewService; import com.casic.missiles.service.quality.IBizQualityTechnicalAnalysisRepService; import com.casic.missiles.service.quality.base.IBaseFileService; import com.casic.missiles.utils.ZipUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; +import java.io.File; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.CompletableFuture; @@ -152,8 +146,8 @@ AuthUser user = permissionContext.getAuthService().getLoginUser(); entity.setCommanderId(user.getId()); entity.setCommanderName(user.getName()); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); saveEntity(entity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); @@ -164,7 +158,7 @@ @Transactional @Override public boolean updateById(BizQualityTechnicalAnalysisRep entity) { - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); BizQualityTechnicalAnalysisRep oldEntity = getById(entity.getId()); updateEntity(entity, oldEntity, QualityTableEnum.TECHNICAL_ANALYSIS_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java index 43f5088..190fb31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,8 +37,8 @@ @Override public void saveList(List bizQualityTemplateItems) { for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } saveBatch(bizQualityTemplateItems); } @@ -58,9 +58,9 @@ } for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) { - bizQualityTemplateItem.setCreateTime(new Date()); + bizQualityTemplateItem.setCreateTime(DateUtil.now()); if (bizQualityTemplateItem.getId() != null) { - bizQualityTemplateItem.setUpdateTime(new Date()); + bizQualityTemplateItem.setUpdateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplateItems); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java index adf122a..62a2b1f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,7 +16,6 @@ import org.springframework.stereotype.Service; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -53,8 +53,8 @@ @Override public void saveList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setCreateTime(new Date()); - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); @@ -65,12 +65,12 @@ @Override public void saveOrUpdateList(List bizQualityTemplates) { for (BizQualityTemplate bizQualityTemplate : bizQualityTemplates) { - bizQualityTemplate.setUpdateTime(new Date()); + bizQualityTemplate.setUpdateTime(DateUtil.now()); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); bizQualityTemplate.setUpdateId(authUser.getId()); bizQualityTemplate.setUpdateName(authUser.getName()); if (bizQualityTemplate.getId() != null) { - bizQualityTemplate.setCreateTime(new Date()); + bizQualityTemplate.setCreateTime(DateUtil.now()); } } saveOrUpdateBatch(bizQualityTemplates); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java index 1419296..e1829c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationScheduleServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl.quality; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -55,8 +55,8 @@ if (CollectionUtil.isNotEmpty(entity.getScheduleList())) { //更新内审进度 entity.getScheduleList().forEach(schedule -> { - schedule.setCreateTime(new Date()); - schedule.setUpdateTime(new Date()); + schedule.setCreateTime(DateUtil.now()); + schedule.setUpdateTime(DateUtil.now()); schedule.setWorkRegistrationId(entity.getId()); }); saveOrUpdateBatch(entity.getScheduleList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index b220ba7..d1b13a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,14 +18,12 @@ import com.casic.missiles.dto.certificate.RegisterCustomParameters; import com.casic.missiles.dto.quality.BizQualityWorkRegistrationVO; import com.casic.missiles.dto.quality.approval.BizQualityWorkRegistrationApprovalVO; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityWorkRegistrationMapper; import com.casic.missiles.model.exception.ServiceException; import com.casic.missiles.model.quality.BizQualityRegistrationScheduleUser; -import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.model.quality.BizQualityWorkRegistration; import com.casic.missiles.model.quality.BizQualityWorkRegistrationSchedule; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -39,7 +36,6 @@ import com.casic.missiles.utils.QualityNoUtil; import com.casic.missiles.utils.ZipUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.Get; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -59,7 +55,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.QUALITY_WORK_REGISTRATION; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.QUALITY_WORK_REGISTRATION_BEAN_NAME; /** *

@@ -70,7 +68,7 @@ * @date 2023-11-10 */ @Slf4j -@Service +@Service(QUALITY_WORK_REGISTRATION_BEAN_NAME) public class BizQualityWorkRegistrationServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityWorkRegistrationService, IBaseFileService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; @@ -123,8 +121,8 @@ @Override public BizQualityWorkRegistration saveBizQualityWorkRegistration(BizQualityWorkRegistration entity) { AuthUser user = permissionContext.getAuthService().getLoginUser(); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); entity.setCreator(user.getId()); entity.setLogTime(new Date()); entity.setCreatorName(user.getName()); @@ -246,7 +244,7 @@ // entity.setSysCode(newCode); // } checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(DateUtil.now()); super.updateById(entity); internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); scheduleService.saveBizQualityWorkRegistrationSchedules(entity); @@ -276,4 +274,9 @@ } return entity; } + + @Override + public void setBizName(BizQualityWorkRegistration obj) { + obj.setBizName(obj.getFileName()); + } } \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java index 5ab4526..4f32536 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceAuthorizeOrderServiceImpl.java @@ -14,7 +14,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceAuthorizeOrderMapper; @@ -24,22 +23,16 @@ import com.casic.missiles.service.resource.IBizResourceAuthorizeOrderService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import liquibase.pro.packaged.A; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.tomcat.jni.Mmap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_STAFF_AUTHORIZE_ORDER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.AUTHORIZE_ORDER_BEAN_NAME; /** *

@@ -49,7 +42,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(AUTHORIZE_ORDER_BEAN_NAME) public class BizResourceAuthorizeOrderServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceAuthorizeOrderService { @@ -108,5 +101,9 @@ } } + @Override + public void setBizName(BizResourceAuthorizeOrder obj) { + obj.setBizName(obj.getOrderName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java index b177a69..8e94d82 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java @@ -37,6 +37,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_EXAMINE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_EXAMINE_FORM_BEAN_NAME; /** *

@@ -46,7 +47,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_EXAMINE_FORM_BEAN_NAME) public class BizResourceCustomerExamineFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerExamineFormService { @Autowired private DeptMapper deptMapper; @@ -213,4 +214,8 @@ return templateList; } + @Override + public void setBizName(BizResourceCustomerExamineForm obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java index 504604c..5cc4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerInfoServiceImpl.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_BEAN_NAME; + /** *

* 资源管理-委托方管理-委托方名录 服务实现类 @@ -44,7 +46,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_BEAN_NAME) public class BizResourceCustomerInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerInfoService { @Autowired private BizResourceCustomerInfoMapper customerInfoMapper; @@ -177,4 +179,9 @@ } return resultApprovalPage; } + + @Override + public void setBizName(BizResourceCustomerInfo obj) { + obj.setBizName(obj.getCustomerName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java index d5af93b..d53aa70 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerResultReviewNoticeServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.model.auth.AuthUser; @@ -57,6 +56,7 @@ import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_RESULT_REVIEW_NOTICE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_RESULT_REVIEW_BEAN_NAME; /** *

@@ -66,7 +66,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_RESULT_REVIEW_BEAN_NAME) public class BizResourceCustomerResultReviewNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerResultReviewNoticeService { @Autowired private BizResourceCustomerResultReviewNoticeMapper resultReviewNoticeMapper; @@ -284,6 +284,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceCustomerResultReviewNotice obj) { + obj.setBizName(obj.getNoticeName()); + } + public QueryWrapper commonQuery(EquipmentQueryFrom queryForm, List sampleIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(Objects.nonNull(queryForm.getCustomerId()), "company_id", queryForm.getCustomerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java index f889041..8c0060a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerSuggestFormServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CUSTOMER_SUGGEST_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CUSTOMER_SUGGEST_FORM_BEAN_NAME; /** *

@@ -42,7 +43,7 @@ * @author wangpeng * @since 2023-08-08 */ -@Service +@Service(CUSTOMER_SUGGEST_FORM_BEAN_NAME) public class BizResourceCustomerSuggestFormServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceCustomerSuggestFormService { @Autowired private PrintFileRegister printFileRegister; @@ -197,4 +198,9 @@ return ReturnUtil.success(); } + @Override + public void setBizName(BizResourceCustomerSuggestForm obj) { + obj.setBizName(obj.getCustomerName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java index d357dc8..767cb19 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentResistanceServiceImpl.java @@ -23,6 +23,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_RESISTANCE_BEAN_NAME; + /** *

* 环境数据管理-实验室接地电阻记录 服务实现类 @@ -31,7 +33,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_RESISTANCE_BEAN_NAME) public class BizResourceEnvironmentResistanceServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentResistanceService { @Override @@ -66,4 +68,9 @@ } + @Override + public void setBizName(BizResourceEnvironmentResistance obj) { + obj.setBizName(obj.getRecordName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java index 471afc5..89a6413 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentUpsRecordServiceImpl.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_UPS_BEAN_NAME; + /** *

* 环境数据管理-UPS蓄电池内阻测试记录 服务实现类 @@ -39,7 +41,7 @@ * @author wangpeng * @since 2023-12-07 */ -@Service +@Service(ENVIRONMENT_UPS_BEAN_NAME) public class BizResourceEnvironmentUpsRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentUpsRecordService { @Autowired private IBizResourceEnvironmentUpsRecordDetailService upsRecordDetailService; @@ -120,6 +122,11 @@ } + @Override + public void setBizName(BizResourceEnvironmentUpsRecord obj) { + obj.setBizName(obj.getRecordName()); + } + private void saveRelationData(BizResourceEnvironmentUpsRecord request) { request.getUpsRecordDetailList().forEach(dto -> { dto.setRecordId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java index bf1c4b9..f503c2a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceEnvironmentVoltageServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceEnvironmentVoltageMapper; import com.casic.missiles.model.resource.BizResourceEnvironmentVoltage; +import com.casic.missiles.model.resource.BizResourceSupplierInfo; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceEnvironmentVoltageService; import com.casic.missiles.utils.DictCodeUtils; @@ -23,6 +24,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.ENVIRONMENT_VOLTAGE_BEAN_NAME; + /** *

* 环境数据管理-工作间供电电压记录 服务实现类 @@ -31,7 +34,7 @@ * @author wangpeng * @since 2023-09-15 */ -@Service +@Service(ENVIRONMENT_VOLTAGE_BEAN_NAME) public class BizResourceEnvironmentVoltageServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceEnvironmentVoltageService { @Override @@ -66,4 +69,8 @@ } + @Override + public void setBizName(BizResourceEnvironmentVoltage obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java index 1b876fb..61c8686 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileApprovalServiceImpl.java @@ -15,7 +15,6 @@ import com.casic.missiles.mapper.system.SystemTemplateMapper; import com.casic.missiles.model.resource.BizResourceFileApproval; import com.casic.missiles.model.resource.BizResourceFileApprovalFile; -import com.casic.missiles.model.system.SystemTemplate; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.resource.IBizResourceFileApprovalFileService; import com.casic.missiles.service.resource.IBizResourceFileApprovalService; @@ -26,6 +25,8 @@ import java.util.List; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_APPROVAL_BEAN_NAME; + /** *

* 资源管理-文件管理-文件审批(审批通过后的文件与体系/技术文件无关) 服务实现类 @@ -34,7 +35,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_APPROVAL_BEAN_NAME) public class BizResourceFileApprovalServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileApprovalService { @Autowired private SystemTemplateMapper templateMapper; @@ -121,4 +122,9 @@ // bizResourceFileApproval.setFileTemplateFile(systemTemplate.getMinioFileName()); return ReturnUtil.success(bizResourceFileApproval); } + + @Override + public void setBizName(BizResourceFileApproval obj) { + obj.setBizName(obj.getApprovalName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index b8cedd8..9ffe522 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -36,6 +36,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_CHANGE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_CHANGE_FORM_BEAN_NAME; /** *

@@ -45,7 +46,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_CHANGE_FORM_BEAN_NAME) public class BizResourceFileChangeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileChangeService { @Autowired private IBizResourceFileChangeFileService changeFileService; @@ -160,6 +161,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileChange obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long changeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("change_id", changeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java index 800fe26..d408e06 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileGrantNoticeServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -17,17 +16,12 @@ import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.workbench.MessageSourceModuleEnum; -import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileGrantNoticeMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; import com.casic.missiles.model.resource.BizResourceFileGrantNotice; import com.casic.missiles.model.resource.BizResourceFileGrantNoticeFile; import com.casic.missiles.model.resource.BizResourceStaffInfo; -import com.casic.missiles.model.resource.BizResourceStaffVerifier; -import com.casic.missiles.model.workbench.WorkbenchRemindMessage; -import com.casic.missiles.modular.system.model.User; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileGrantNoticeFileService; @@ -45,6 +39,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_GRANT_NOTICE_BEAN_NAME; /** *

@@ -54,7 +49,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_GRANT_NOTICE_BEAN_NAME) public class BizResourceFileGrantNoticeServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileGrantNoticeService { @Autowired private IBizResourceFileGrantNoticeFileService grantNoticeFileService; @@ -207,4 +202,9 @@ return ReturnUtil.success(resourceStaffInfoList); } + @Override + public void setBizName(BizResourceFileGrantNotice obj) { + obj.setBizName(obj.getFormName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java index be97ba7..84b4384 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodConfirmServiceImpl.java @@ -13,7 +13,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileMethodConfirmMapper; @@ -30,7 +29,9 @@ import javax.servlet.http.HttpServletResponse; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_METHOD_CONFIRM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_CONFIRM_BEAN_NAME; /** *

@@ -40,7 +41,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_CONFIRM_BEAN_NAME) public class BizResourceFileMethodConfirmServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodConfirmService { @Autowired @@ -83,4 +84,9 @@ printFileRegister.registerPrintFile(RESOURCE_FILE_METHOD_CONFIRM, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } } + + @Override + public void setBizName(BizResourceFileMethodConfirm obj) { + obj.setBizName(obj.getFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java index 99ff716..066a925 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java @@ -25,7 +25,6 @@ import com.casic.missiles.service.resource.IBizResourceFileMethodNoveltySearchService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME; + /** *

* 资源管理-文件管理-测试校准检定方法查新记录表 服务实现类 @@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-13 */ -@Service +@Service(FILE_METHOD_NOVELTY_SEARCH_BEAN_NAME) public class BizResourceFileMethodNoveltySearchServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileMethodNoveltySearchService { @Autowired private IBizResourceFileMethodNoveltySearchLogService noveltySearchLogService; @@ -152,6 +153,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileMethodNoveltySearch obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noveltyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("novelty_id", noveltyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java index 1546f0b..0b2b221 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java @@ -15,15 +15,12 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; -import com.casic.missiles.enums.system.FilePrintEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileRecallArchiveMapper; import com.casic.missiles.model.resource.BizResourceFileRecallArchive; import com.casic.missiles.model.resource.BizResourceFileRecallArchiveFile; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.service.flowable.ApprovalOperateService; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveFileService; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveService; @@ -38,7 +35,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_FILE_RECALL_ARCHIVE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.FILE_RECALL_ARCHIVE_BEAN_NAME; /** *

@@ -48,7 +47,7 @@ * @author wangpeng * @since 2023-09-12 */ -@Service +@Service(FILE_RECALL_ARCHIVE_BEAN_NAME) public class BizResourceFileRecallArchiveServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceFileRecallArchiveService { @Autowired private IBizResourceFileRecallArchiveFileService recallArchiveFileService; @@ -160,6 +159,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceFileRecallArchive obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long noticeId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("archive_id", noticeId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java index 1102ccd..1eeacfb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealUseNoteServiceImpl.java @@ -1,9 +1,7 @@ package com.casic.missiles.service.Impl.resource; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -11,7 +9,6 @@ import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.resource.seal.SealLogListRequest; import com.casic.missiles.dto.resource.seal.SealNoteApprovalListRequest; import com.casic.missiles.dto.resource.seal.SealNoteSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -19,14 +16,12 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSealUseNoteMapper; -import com.casic.missiles.model.resource.BizResourceSealUseLog; import com.casic.missiles.model.resource.BizResourceSealUseNote; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceSealUseNoteService; import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,7 +30,9 @@ import java.util.List; import java.util.Map; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SEAL_USE_NOTE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SEAL_USE_BEAN_NAME; /** *

@@ -45,7 +42,7 @@ * @author wangpeng * @since 2023-07-28 */ -@Service +@Service(SEAL_USE_BEAN_NAME) public class BizResourceSealUseNoteServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSealUseNoteService { @Autowired @@ -95,4 +92,8 @@ } } + @Override + public void setBizName(BizResourceSealUseNote obj) { + obj.setBizName(obj.getNoteFormName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java index 9ff1881..403f910 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareReviewReportServiceImpl.java @@ -35,6 +35,8 @@ import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVIEW_REPORT_BEAN_NAME; + /** *

* 在用软件管理-软件评审报告 服务实现类 @@ -43,7 +45,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVIEW_REPORT_BEAN_NAME) public class BizResourceSoftwareReviewReportServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareReviewReportService { @Autowired private IBizResourceSoftwareReviewReportStaffService reviewReportStaffService; @@ -150,6 +152,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSoftwareReviewReport obj) { + obj.setBizName(obj.getReportName()); + } + private void removeRelationData(Long reportId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("report_id", reportId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java index 451a4fb..5b7b654 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSoftwareRevisionApplyServiceImpl.java @@ -29,6 +29,8 @@ import javax.validation.Valid; import java.util.Map; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SOFTWARE_REVISION_APPLY_BEAN_NAME; + /** *

* 在用软件管理-软件修订申请 服务实现类 @@ -37,7 +39,7 @@ * @author wangpeng * @since 2023-09-14 */ -@Service +@Service(SOFTWARE_REVISION_APPLY_BEAN_NAME) public class BizResourceSoftwareRevisionApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSoftwareRevisionApplyService { @Autowired @@ -80,5 +82,8 @@ printFileRegister.registerPrintFile(PrintFileModuleNameEnum.SOFTWARE_REVISION_REQUEST, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } - + @Override + public void setBizName(BizResourceSoftwareRevisionApply obj) { + obj.setBizName(obj.getApplyName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java index 878ce47..ec0db87 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsApplyServiceImpl.java @@ -35,6 +35,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.CONSUMABLE_GOODS_APPLY_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.CONSUMABLE_GOODS_APPLY_BEAN_NAME; /** *

@@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-18 */ -@Service +@Service(CONSUMABLE_GOODS_APPLY_BEAN_NAME) public class BizResourceSupplierConsumableGoodsApplyServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsApplyService { @Autowired private IBizResourceSupplierConsumableGoodsDetailService goodsDetailService; @@ -156,6 +157,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsApply obj) { + obj.setBizName(obj.getApplyName()); + } + private void removeRelationData(Long applyId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id", applyId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java index e12dc77..6fb275c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsEvaluateServiceImpl.java @@ -18,7 +18,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierConsumableGoodsEvaluateMapper; @@ -39,7 +38,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_CONSUMABLE_GOODS_EVALUATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME; /** *

@@ -49,7 +50,7 @@ * @author wangpeng * @since 2023-09-21 */ -@Service +@Service(SUPPLIER_CONSUMABLE_GOODS_EVALUATE_BEAN_NAME) public class BizResourceSupplierConsumableGoodsEvaluateServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsEvaluateService { @Autowired private IBizResourceSupplierConsumableGoodsEvaluateContentService goodsEvaluateContentService; @@ -169,6 +170,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsEvaluate obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long formId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("form_id", formId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java index f7cf0a5..d71c951 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierConsumableGoodsUseServiceImpl.java @@ -17,7 +17,6 @@ import com.casic.missiles.dto.resource.supplier.SupplierConsumableGoodsUseSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierConsumableGoodsUseMapper; @@ -38,7 +37,9 @@ import java.util.Map; import java.util.Objects; -import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_CONSUMABLE_GOODS_USE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME; /** *

@@ -48,7 +49,7 @@ * @author wangpeng * @since 2023-09-20 */ -@Service +@Service(SUPPLIER_CONSUMABLE_GOODS_USE_BEAN_NAME) public class BizResourceSupplierConsumableGoodsUseServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierConsumableGoodsUseService { @Autowired private IBizResourceSupplierConsumableGoodsUseDetailService goodsUseDetailService; @@ -163,6 +164,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierConsumableGoodsUse obj) { + obj.setBizName(obj.getRecordName()); + } + private void removeRelationData(Long recordId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("record_id", recordId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java index f0f6d47..ba436a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierEvaluateServiceImpl.java @@ -18,7 +18,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; -import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceSupplierEvaluateMapper; @@ -35,11 +34,13 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.util.*; -import java.util.stream.Collectors; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_EVALUATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_EVALUATE_BEAN_NAME; /** *

@@ -49,7 +50,7 @@ * @author wangpeng * @since 2023-09-21 */ -@Service +@Service(SUPPLIER_EVALUATE_BEAN_NAME) public class BizResourceSupplierEvaluateServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierEvaluateService { @Autowired private IBizResourceSupplierEvaluateContentService evaluateContentService; @@ -180,6 +181,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierEvaluate obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long formId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("form_id", formId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java index 68d328b..b85f6f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsAcceptanceRecordServiceImpl.java @@ -30,6 +30,7 @@ import java.util.Map; import static com.casic.missiles.enums.PrintFileModuleNameEnum.GOODS_ACCEPTANCE_APPLY_FORM; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME; /** *

@@ -39,7 +40,7 @@ * @author wangpeng * @since 2023-09-19 */ -@Service +@Service(SUPPLIER_GOODS_ACCEPTANCE_BEAN_NAME) public class BizResourceSupplierGoodsAcceptanceRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierGoodsAcceptanceRecordService { @Autowired private PrintFileRegister printFileRegister; @@ -82,4 +83,9 @@ Map map = BeanUtil.beanToMap(acceptanceRecord); printFileRegister.registerPrintFile(GOODS_ACCEPTANCE_APPLY_FORM, "1", null, map, exportDTO.isPdf(), response); } + + @Override + public void setBizName(BizResourceSupplierGoodsAcceptanceRecord obj) { + obj.setBizName(obj.getRecordName()); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java index d1759d3..c656fbf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierGoodsWarehouseServiceImpl.java @@ -35,6 +35,7 @@ import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.GOODS_WAREHOUSE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME; /** *

@@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-09-19 */ -@Service +@Service(SUPPLIER_GOODS_WAREHOUSE_BEAN_NAME) public class BizResourceSupplierGoodsWarehouseServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierGoodsWarehouseService { @Autowired private IBizResourceSupplierGoodsWarehouseDetailService goodsWarehouseDetailService; @@ -165,6 +166,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierGoodsWarehouse obj) { + obj.setBizName(obj.getWarehouseName()); + } + private void removeRelationData(Long warehouseId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("warehouse_id", warehouseId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierInfoServiceImpl.java index 5a7bf27..b448cb8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierInfoServiceImpl.java @@ -35,6 +35,7 @@ import java.util.stream.Collectors; import static com.casic.missiles.enums.PrintFileModuleNameEnum.SUPPLIER; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_BEAN_NAME; /** *

@@ -44,7 +45,7 @@ * @author wangpeng * @since 2023-07-27 */ -@Service +@Service(SUPPLIER_BEAN_NAME) public class BizResourceSupplierInfoServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierInfoService { @Autowired private IBizResourceSupplierPersonService supplierPersonService; @@ -182,4 +183,9 @@ return ReturnUtil.success(response); } + @Override + public void setBizName(BizResourceSupplierInfo obj) { + obj.setBizName(obj.getSupplierName()); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierServiceEvaluateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierServiceEvaluateServiceImpl.java index ba36830..c0c4a60 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierServiceEvaluateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSupplierServiceEvaluateServiceImpl.java @@ -28,17 +28,19 @@ import com.casic.missiles.service.resource.IBizResourceSupplierServiceEvaluateService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; -import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; -import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; import static com.casic.missiles.enums.PrintFileModuleNameEnum.RESOURCE_SUPPLIER_SERVICE_EVALUATE; +import static com.casic.missiles.enums.notifyevent.BizBeanEnum.SUPPLIER_SERVICE_EVALUATE_BEAN_NAME; /** *

@@ -48,7 +50,7 @@ * @author wangpeng * @since 2023-09-20 */ -@Service +@Service(SUPPLIER_SERVICE_EVALUATE_BEAN_NAME) public class BizResourceSupplierServiceEvaluateServiceImpl extends GeneralApprovalServiceImpl implements IBizResourceSupplierServiceEvaluateService { @Autowired private IBizResourceSupplierServiceEvaluateContentService evaluateContentService; @@ -168,6 +170,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public void setBizName(BizResourceSupplierServiceEvaluate obj) { + obj.setBizName(obj.getFormName()); + } + private void removeRelationData(Long formId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("form_id", formId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/BizWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/BizWorkbenchServiceImpl.java index c173fbe..6fc74f5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/BizWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/BizWorkbenchServiceImpl.java @@ -4,27 +4,41 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.GeneralApprovalDTO; import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.BaseApprovalListRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.EquipmentApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardApprovalListRequest; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.notifyevent.AwareActionStatusEnum; +import com.casic.missiles.enums.system.ApplyFromIdEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; +import com.casic.missiles.model.equipment.BizEquipmentStandardInfo; import com.casic.missiles.model.quality.BizLabRelDept; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import com.casic.missiles.modular.system.dao.DictMapper; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; +import com.casic.missiles.service.Impl.equipment.BizEquipmentInfoServiceImpl; +import com.casic.missiles.service.Impl.equipment.BizEquipmentStandardInfoServiceImpl; import com.casic.missiles.service.business.IBizBusinessDeviceMeasureApprovalService; import com.casic.missiles.service.equipment.IBizEquipmentInfoService; import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckRecordApprovalService; import com.casic.missiles.service.quality.IBizLabRelDeptService; import com.casic.missiles.service.workbench.IBizWorkbenchService; +import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.SpringContextUtil; import com.casic.missiles.utils.SysDeptAndUserUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -41,6 +55,8 @@ import java.util.*; import java.util.stream.Collectors; +import static com.casic.missiles.enums.notifyevent.AwareActionStatusEnum.ACTION_STATUS_MAP; + /** * @Description: * @Author: wangpeng @@ -59,6 +75,8 @@ private IBizBusinessDeviceMeasureApprovalService measureApprovalService; @Autowired private IBizEquipmentStandardCheckRecordApprovalService checkRecordApprovalService; + @Autowired + private WorkbenchApprovalMessageMapper approvalMessageMapper; @Override public BizWorkbenchEquipmentAmount equipmentAmount(WorkbenchCommonRequest request) { @@ -242,6 +260,226 @@ return resultList; } + @Override + public List toBeApprovedListPage(ApprovalMessageRequest request) throws Exception { + return workbenchApprovalMessageList(request, 1); + } + + @Override + public List approvedListPage(ApprovalMessageRequest request) throws Exception { + return workbenchApprovalMessageList(request, 2); + } + + @NotNull + private List workbenchApprovalMessageList(ApprovalMessageRequest request, int approvalType) throws Exception { + AuthUser user = ShiroKit.getUser(); + Assert.isFalse(Objects.isNull(user), () -> { + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); + }); + List resultList = new ArrayList<>(); + Map actionStatusMap = ACTION_STATUS_MAP.getActionStatusMap(); + //待审批通知 + Arrays.stream(ApplyFromIdEnum.values()).forEach(applyFromIdEnum -> { + if (StringUtils.isNotEmpty(request.getSourceModule()) && !applyFromIdEnum.getSerialNumber().equals(request.getSourceModule())) { + return; + } + String beanName = actionStatusMap.get(applyFromIdEnum.getCode()).getBizBeanName(); + //设备台账与标准装置区分新建、编辑、删除审批，单独处理 + if(ApplyFromIdEnum.EQUIPMENT_APPROVAL.getCode().equals(applyFromIdEnum.getCode())){ + //设备台账 + if (1 == approvalType) { + convertForEquipment(resultList, applyFromIdEnum, 1); + } else { + convertForEquipment(resultList, applyFromIdEnum, 2); + } + } else if(ApplyFromIdEnum.STANDARD_APPROVAL.getCode().equals(applyFromIdEnum.getCode())){ + //标准装置 + if (1 == approvalType) { + convertForStandard(resultList, applyFromIdEnum, 1); + } else { + convertForStandard(resultList, applyFromIdEnum, 2); + } + } else if (ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode().equals(applyFromIdEnum.getCode())) { + // TODO: 2024/5/16 + if (1 == approvalType) { + + } else { + + } + } else { + if (1 == approvalType) { + convertTobeApproved(SpringContextUtil.getBean(beanName), applyFromIdEnum, resultList); + } else { + convertApproved(SpringContextUtil.getBean(beanName), applyFromIdEnum, resultList); + } + } + }); + //审批结果通知 + if (1 == approvalType) { + handleApprovalResultMessage(request, user, 0, resultList); + } else { + handleApprovalResultMessage(request, user, 1, resultList); + } + //按时间排序组装 + List finalList = resultList.stream().sorted(Comparator.comparing(WorkbenchApprovalMessage::getCreateTime).reversed()).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(finalList)) { + for (WorkbenchApprovalMessage approvalMessage : finalList) { + DictCodeUtils.convertDictCodeToName(approvalMessage); + //丰富跳转参数 +// enrichSkipParams(approvalMessage); + } + } + return finalList; + } + + @Override + public ReturnDTO updateStatus(ApprovalMessageUpdateRequest updateRequest) { + WorkbenchApprovalMessage message = new WorkbenchApprovalMessage(); + message.setId(updateRequest.getId()); + message.setReadStatus(updateRequest.getStatus()); + if(approvalMessageMapper.updateById(message) > 0) return ReturnUtil.success(); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + private void convertForEquipment(List resultList, ApplyFromIdEnum applyFromIdEnum, int approvalType) { + BizEquipmentInfoServiceImpl equipmentInfoBean = SpringContextUtil.getBean("bizEquipmentInfoServiceImpl"); + EquipmentApprovalListRequest equipmentApprovalListRequest = new EquipmentApprovalListRequest(); + Page page = new Page<>(); + page.setCurrent(1); + page.setSearchCount(false); + page.setSize(Integer.MAX_VALUE); + Page bizEquipmentInfoPage = null; + Integer readStatus; + if (1 == approvalType) { + bizEquipmentInfoPage = equipmentInfoBean.handlerBeApproved(page, page, equipmentApprovalListRequest); + readStatus = 0; + } else { + bizEquipmentInfoPage = equipmentInfoBean.handlerApproved(page, page, equipmentApprovalListRequest); + readStatus = 1; + } + if (Objects.nonNull(bizEquipmentInfoPage) && !CollectionUtils.isEmpty(bizEquipmentInfoPage.getRecords())) { + bizEquipmentInfoPage.getRecords().forEach(info -> { + WorkbenchApprovalMessage message = new WorkbenchApprovalMessage(); + message.setCreateTime(info.getCreateTime()); + message.setFormId(applyFromIdEnum.getCode()); + message.setSourceModule(applyFromIdEnum.getSerialNumber()); + message.setMessageTitle("待审批通知"); + //1新增2编辑3删除 + String type = "新建"; + if (2 == info.getApprovalType()) { + type = "修改"; + } else if (3 == info.getApprovalType()) { + type = "删除"; + } + message.setMessageContent(info.getEquipmentName() + type + "待审批"); + message.setReadStatus(readStatus); + message.setBizId(String.valueOf(info.getId())); + message.setProcessId(info.getProcessId()); + message.setTaskId(info.getTaskId()); + message.setDecisionItem(info.getDecisionItem()); + resultList.add(message); + }); + } + } + + private void convertForStandard(List resultList, ApplyFromIdEnum applyFromIdEnum, int approvalType) { + BizEquipmentStandardInfoServiceImpl standardInfoBean = SpringContextUtil.getBean("bizEquipmentStandardInfoServiceImpl"); + StandardApprovalListRequest standardApprovalListRequest = new StandardApprovalListRequest(); + Page page = new Page<>(); + page.setCurrent(1); + page.setSearchCount(false); + page.setSize(Integer.MAX_VALUE); + Page bizStandardInfoPage = null; + Integer readStatus; + if (1 == approvalType) { + bizStandardInfoPage = standardInfoBean.handlerBeApproved(page, page, standardApprovalListRequest); + readStatus = 0; + } else { + bizStandardInfoPage = standardInfoBean.handlerApproved(page, page, standardApprovalListRequest); + readStatus = 1; + } + if (Objects.nonNull(bizStandardInfoPage) && !CollectionUtils.isEmpty(bizStandardInfoPage.getRecords())) { + bizStandardInfoPage.getRecords().forEach(info -> { + WorkbenchApprovalMessage message = new WorkbenchApprovalMessage(); + message.setCreateTime(info.getCreateTime()); + message.setFormId(applyFromIdEnum.getCode()); + message.setSourceModule(applyFromIdEnum.getSerialNumber()); + message.setMessageTitle("待审批通知"); + //1新增2编辑3删除 + String type = "新建"; + if (2 == info.getApprovalType()) { + type = "修改"; + } else if (3 == info.getApprovalType()) { + type = "删除"; + } + message.setMessageContent(info.getStandardName() + type + "待审批"); + message.setReadStatus(readStatus); + message.setBizId(String.valueOf(info.getId())); + message.setProcessId(info.getProcessId()); + message.setTaskId(info.getTaskId()); + message.setDecisionItem(info.getDecisionItem()); + resultList.add(message); + }); + } + } + + private void handleApprovalResultMessage(ApprovalMessageRequest request, AuthUser user, int readStatus, List resultList) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("notice_id", user.getId()); + wrapper.eq(StringUtils.isNotBlank(request.getSourceModule()), "source_module", request.getSourceModule()); + wrapper.eq("read_status", readStatus); + wrapper.apply(StringUtils.isNotBlank(request.getStartTime()), + "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]); + wrapper.apply(StringUtils.isNotBlank(request.getEndTime()), + "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]); + List list = approvalMessageMapper.selectList(wrapper); + if (!CollectionUtils.isEmpty(list)) { + resultList.addAll(list); + } + } + + private void convertTobeApproved(S service, ApplyFromIdEnum applyFromIdEnum, List resultList) { + List toBeApprovedList = service.handlerBeApproved(applyFromIdEnum.getCode()); + if (!CollectionUtils.isEmpty(toBeApprovedList)) { + toBeApprovedList.forEach(a -> { + WorkbenchApprovalMessage message = new WorkbenchApprovalMessage(); + message.setCreateTime(a.getCreateTime()); + message.setFormId(applyFromIdEnum.getCode()); + message.setSourceModule(applyFromIdEnum.getSerialNumber()); + message.setMessageTitle("待审批通知"); + message.setMessageContent(a.getBizName() + "新建待审批"); + message.setReadStatus(0); + message.setBizId(String.valueOf(a.getId())); + message.setProcessId(a.getProcessId()); + message.setTaskId(a.getTaskId()); + message.setDecisionItem(a.getDecisionItem()); + resultList.add(message); + }); + } + } + + private void convertApproved(S service, ApplyFromIdEnum applyFromIdEnum, List resultList) { + BaseApprovalListRequest approvalListRequest = new BaseApprovalListRequest(); + approvalListRequest.setFormId(applyFromIdEnum.getCode()); + List approvedList = service.handlerApprovedList(applyFromIdEnum.getCode()); + if (!CollectionUtils.isEmpty(approvedList)) { + approvedList.forEach(a -> { + WorkbenchApprovalMessage message = new WorkbenchApprovalMessage(); + message.setCreateTime(a.getCreateTime()); + message.setFormId(applyFromIdEnum.getCode()); + message.setSourceModule(applyFromIdEnum.getSerialNumber()); + message.setMessageTitle("待审批通知"); + message.setMessageContent(a.getBizName() + "新建待审批"); + message.setReadStatus(1); + message.setBizId(String.valueOf(a.getId())); + message.setProcessId(a.getProcessId()); + message.setTaskId(a.getTaskId()); + message.setDecisionItem(a.getDecisionItem()); + resultList.add(message); + }); + } + } + @Nullable private Long handleStaffTypeRequest(WorkbenchCommonRequest request) { AuthUser user = ShiroKit.getUser(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IBizWorkbenchService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IBizWorkbenchService.java index 2e8732d..e54c183 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IBizWorkbenchService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IBizWorkbenchService.java @@ -1,9 +1,8 @@ package com.casic.missiles.service.workbench; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.workbench.WorkbenchCommonRequest; -import com.casic.missiles.model.workbench.BizWorkbenchCommonDTO; -import com.casic.missiles.model.workbench.BizWorkbenchEquipmentAmount; -import com.casic.missiles.model.workbench.BizWorkbenchExpireTrend; +import com.casic.missiles.model.workbench.*; import java.util.List; @@ -31,4 +30,11 @@ List measureConclusion(WorkbenchCommonRequest request); List recordAmount(WorkbenchCommonRequest request); + + List toBeApprovedListPage(ApprovalMessageRequest request) throws Exception; + + List approvedListPage(ApprovalMessageRequest request) throws Exception; + + ReturnDTO updateStatus(ApprovalMessageUpdateRequest updateRequest); + }